aboutsummaryrefslogtreecommitdiff
path: root/modules/core
diff options
context:
space:
mode:
Diffstat (limited to 'modules/core')
-rw-r--r--modules/core/core-bundle.js79
-rw-r--r--modules/core/module-aiassist.js44
-rw-r--r--modules/core/module-loader.js2
-rw-r--r--modules/core/module-orchestrator.js35
4 files changed, 127 insertions, 33 deletions
diff --git a/modules/core/core-bundle.js b/modules/core/core-bundle.js
index 71f3ada..2a7ec3e 100644
--- a/modules/core/core-bundle.js
+++ b/modules/core/core-bundle.js
@@ -9037,7 +9037,7 @@ buildSystemPrompt() {
parameters: { type: 'object', properties: {
path: { type: 'string', description: 'File path' },
offset: { type: 'integer', description: 'Start character offset (default 0)' },
- limit: { type: 'integer', description: 'Max characters per page (default 8000). The effective page size follows the current model\'s budget and is capped again before the result enters context — the response carries returned_chars/total_chars/truncated/next_offset, page on those' }
+ limit: { type: 'integer', description: 'Max characters per page (defaults to the active model page budget, ~12k for a large model). A page is never larger than the result clip, so next_offset is always the next unseen character and is capped again before the result enters context — the response carries returned_chars/total_chars/truncated/next_offset, page on those' }
}, required: ['path'] }
}
}, {
@@ -10324,12 +10324,28 @@ max_chars: { type: 'integer', description: 'Max characters of page content to re
try {
const obj = JSON.parse(text);
if (obj && typeof obj.content === 'string' && obj.content.length > 0) {
- const keep = Math.max(500, max - 200); // headroom for the other keys
+ // headroom for the other keys, and a whole character (never half a
+ // surrogate pair, which would make JSON.stringify emit a bad body)
+ let keep = Math.max(500, max - 200);
+ if (keep < obj.content.length) {
+ const c = obj.content.charCodeAt(keep - 1);
+ if (c >= 0xD800 && c <= 0xDBFF) keep -= 1;
+ }
+ const hadMore = (obj.next_offset !== null && obj.next_offset !== undefined);
+ const full = obj.content.length;
obj.returned_chars = keep;
+ obj.returned = keep;
obj.content = obj.content.slice(0, keep) +
- '\n…[clipped: ' + (obj.content.length - keep) + ' of ' + obj.content.length +
+ '\n…[clipped: ' + (full - keep) + ' of ' + full +
' chars withheld — re-read with offset/limit if you need the rest]';
obj.clipped = true;
+ // A page that was already the last one has no next_offset to keep. If
+ // the tail is removed anyway, the caller must still be told there is
+ // more, or it concludes it has the whole file (measured 2026-11-02).
+ if (!hadMore) {
+ obj.next_offset = (Number(obj.offset) || 0) + keep;
+ obj.truncated = true;
+ }
return JSON.stringify(obj);
}
} catch (e) { /* not JSON → fall through to the string clip */ }
@@ -11456,7 +11472,13 @@ max_chars: { type: 'integer', description: 'Max characters of page content to re
const total = content.length;
let offset = Math.max(0, Math.min(parseInt(a.offset, 10) || 0, total));
const pageCap = Math.max(500, Math.min(this._toolLimit('readPageChars'), 200000));
- const limit = Math.max(500, Math.min(parseInt(a.limit, 10) || 8000, pageCap));
+ // A page bigger than the result budget gets clipped on the way out,
+ // and a clipped page's tail is invisible to the model. Cap the page
+ // at what the clip will keep (200 = headroom for the envelope keys)
+ // so a page is always shown whole and next_offset stays contiguous.
+ const resultRoom = Math.max(500, this._toolLimit('toolResultChars') - 200);
+ const defaultPage = Math.min(pageCap, resultRoom);
+ const limit = Math.max(500, Math.min(parseInt(a.limit, 10) || defaultPage, pageCap, resultRoom));
// Never split a surrogate pair (emoji/CJK-ext) across pages:
// a lone surrogate makes JSON.stringify emit an invalid body.
if (offset > 0) {
@@ -11803,7 +11825,19 @@ max_chars: { type: 'integer', description: 'Max characters of page content to re
if (!orch) return JSON.stringify({ error: 'Orchestrator not available' });
try {
const result = await orch.delegateTask(task);
- return JSON.stringify({ success: true, task: task.substring(0, 80), result: typeof result === 'string' ? result.substring(0, 500) : 'completed' });
+ // undefined/null/{} must all read as "no answer" — JSON.stringify(undefined)
+ // is undefined, and JSON.stringify({}) is a truthy '{}'.
+ const answer = typeof result === 'string'
+ ? result
+ : ((result && typeof result.content === 'string') ? result.content : '');
+ // Never invent "completed": an empty answer is reported as a failure
+ // so the caller (model or human) knows nothing came back.
+ return JSON.stringify({
+ success: !!answer,
+ task: task.substring(0, 80),
+ result: answer ? answer.substring(0, 500) : null,
+ error: answer ? undefined : 'worker returned no answer'
+ });
} catch (e) {
return JSON.stringify({ error: 'Delegation failed: ' + e.message });
}
@@ -17442,13 +17476,21 @@ class OrchestratorModule {
if (r.status === 'fulfilled') {
// Find the agent that handled this sub-task
const agent = Object.values(this._agents).find(a => a.currentTask === sub.goal || (a.lastTask === sub.goal));
- if (agent) {
- const outbox = this.terminal.fs.fsReadJSON(`/agents/${agent.id}/outbox.json`);
- const snippet = outbox?.result ? outbox.result.substring(0, 200) : 'completed (no outbox)';
- summaries.push({ task: sub.goal, agent: agent.id, status: 'ok', result: snippet });
- } else {
- summaries.push({ task: sub.goal, status: 'ok', result: 'completed (agent recycled)' });
+ if (!agent) {
+ // "ok / completed (agent recycled)" told the caller a task succeeded
+ // when we could not even find its agent.
+ summaries.push({ task: sub.goal, status: 'failed', error: 'agent not found — result unverifiable' });
+ continue;
}
+ const outbox = this.terminal.fs.fsReadJSON(`/agents/${agent.id}/outbox.json`);
+ const body = outbox && typeof outbox.result === 'string' ? outbox.result : '';
+ const snippet = body.substring(0, 200);
+ summaries.push({
+ task: sub.goal, agent: agent.id,
+ status: body ? 'ok' : 'failed',
+ result: body || null,
+ error: body ? undefined : (outbox && outbox.error) || 'no result in outbox'
+ });
} else {
summaries.push({ task: sub.goal, status: 'failed', error: r.reason?.message || 'unknown error' });
}
@@ -17554,26 +17596,31 @@ class OrchestratorModule {
const _agentTag = agent.id + '/' + (agent.role || 'worker');
const result = await aiModule.chat([`[DELEGATED] ${task}`], { agentTag: _agentTag });
try { aiModule._sessions.delete(_agentTag); } catch (_e) {}
- agent.status = 'completed';
+ // chat() resolves {content, toolTurns}. Anything that is not a non-empty answer
+ // is a failure — the old code substituted the literal "completed", so a worker
+ // that returned nothing was indistinguishable from one that finished.
+ const _answer = typeof result === 'string' ? result : ((result && result.content) || '');
+ agent.status = _answer ? 'completed' : 'failed';
// Write result to outbox
this.terminal.fs.writeFile(`agents/${agent.id}/outbox.json`, JSON.stringify({
- result: typeof result === 'string' ? result : (result?.content || 'completed'),
- status: 'completed',
+ result: _answer || null,
+ status: _answer ? 'completed' : 'failed',
+ error: _answer ? null : 'agent produced no answer',
timestamp: new Date().toISOString()
}));
// Record in memory graph
const memgraph = this.terminal.moduleManager.modules['MemoryGraphModule'];
if (memgraph) {
- memgraph.recordTask(task, typeof result === 'string' ? result : (result?.content || ''), agent.id);
+ memgraph.recordTask(task, _answer, agent.id);
memgraph.recordFileAccess(`/agents/${agent.id}/outbox.json`);
}
this.terminal.print(`✅ ${agent.id} completed task`, 'success');
// Return result for callers that await delegateTask
- outboxResult = typeof result === 'string' ? result : (result?.content || 'completed');
+ outboxResult = _answer; // '' when the worker returned nothing; callers see that
// Check restart policy — if always, set back to idle for next task
if (agent.restartPolicy === 'always') {
diff --git a/modules/core/module-aiassist.js b/modules/core/module-aiassist.js
index 09551c2..0a0ea71 100644
--- a/modules/core/module-aiassist.js
+++ b/modules/core/module-aiassist.js
@@ -162,7 +162,7 @@ buildSystemPrompt() {
parameters: { type: 'object', properties: {
path: { type: 'string', description: 'File path' },
offset: { type: 'integer', description: 'Start character offset (default 0)' },
- limit: { type: 'integer', description: 'Max characters per page (default 8000). The effective page size follows the current model\'s budget and is capped again before the result enters context — the response carries returned_chars/total_chars/truncated/next_offset, page on those' }
+ limit: { type: 'integer', description: 'Max characters per page (defaults to the active model page budget, ~12k for a large model). A page is never larger than the result clip, so next_offset is always the next unseen character and is capped again before the result enters context — the response carries returned_chars/total_chars/truncated/next_offset, page on those' }
}, required: ['path'] }
}
}, {
@@ -1449,12 +1449,28 @@ max_chars: { type: 'integer', description: 'Max characters of page content to re
try {
const obj = JSON.parse(text);
if (obj && typeof obj.content === 'string' && obj.content.length > 0) {
- const keep = Math.max(500, max - 200); // headroom for the other keys
+ // headroom for the other keys, and a whole character (never half a
+ // surrogate pair, which would make JSON.stringify emit a bad body)
+ let keep = Math.max(500, max - 200);
+ if (keep < obj.content.length) {
+ const c = obj.content.charCodeAt(keep - 1);
+ if (c >= 0xD800 && c <= 0xDBFF) keep -= 1;
+ }
+ const hadMore = (obj.next_offset !== null && obj.next_offset !== undefined);
+ const full = obj.content.length;
obj.returned_chars = keep;
+ obj.returned = keep;
obj.content = obj.content.slice(0, keep) +
- '\n…[clipped: ' + (obj.content.length - keep) + ' of ' + obj.content.length +
+ '\n…[clipped: ' + (full - keep) + ' of ' + full +
' chars withheld — re-read with offset/limit if you need the rest]';
obj.clipped = true;
+ // A page that was already the last one has no next_offset to keep. If
+ // the tail is removed anyway, the caller must still be told there is
+ // more, or it concludes it has the whole file (measured 2026-11-02).
+ if (!hadMore) {
+ obj.next_offset = (Number(obj.offset) || 0) + keep;
+ obj.truncated = true;
+ }
return JSON.stringify(obj);
}
} catch (e) { /* not JSON → fall through to the string clip */ }
@@ -2581,7 +2597,13 @@ max_chars: { type: 'integer', description: 'Max characters of page content to re
const total = content.length;
let offset = Math.max(0, Math.min(parseInt(a.offset, 10) || 0, total));
const pageCap = Math.max(500, Math.min(this._toolLimit('readPageChars'), 200000));
- const limit = Math.max(500, Math.min(parseInt(a.limit, 10) || 8000, pageCap));
+ // A page bigger than the result budget gets clipped on the way out,
+ // and a clipped page's tail is invisible to the model. Cap the page
+ // at what the clip will keep (200 = headroom for the envelope keys)
+ // so a page is always shown whole and next_offset stays contiguous.
+ const resultRoom = Math.max(500, this._toolLimit('toolResultChars') - 200);
+ const defaultPage = Math.min(pageCap, resultRoom);
+ const limit = Math.max(500, Math.min(parseInt(a.limit, 10) || defaultPage, pageCap, resultRoom));
// Never split a surrogate pair (emoji/CJK-ext) across pages:
// a lone surrogate makes JSON.stringify emit an invalid body.
if (offset > 0) {
@@ -2928,7 +2950,19 @@ max_chars: { type: 'integer', description: 'Max characters of page content to re
if (!orch) return JSON.stringify({ error: 'Orchestrator not available' });
try {
const result = await orch.delegateTask(task);
- return JSON.stringify({ success: true, task: task.substring(0, 80), result: typeof result === 'string' ? result.substring(0, 500) : 'completed' });
+ // undefined/null/{} must all read as "no answer" — JSON.stringify(undefined)
+ // is undefined, and JSON.stringify({}) is a truthy '{}'.
+ const answer = typeof result === 'string'
+ ? result
+ : ((result && typeof result.content === 'string') ? result.content : '');
+ // Never invent "completed": an empty answer is reported as a failure
+ // so the caller (model or human) knows nothing came back.
+ return JSON.stringify({
+ success: !!answer,
+ task: task.substring(0, 80),
+ result: answer ? answer.substring(0, 500) : null,
+ error: answer ? undefined : 'worker returned no answer'
+ });
} catch (e) {
return JSON.stringify({ error: 'Delegation failed: ' + e.message });
}
diff --git a/modules/core/module-loader.js b/modules/core/module-loader.js
index 367ad60..e1ed716 100644
--- a/modules/core/module-loader.js
+++ b/modules/core/module-loader.js
@@ -4,7 +4,7 @@
// Core module bundle loaded synchronously in main.html.
// This loader only handles version cache-busting, splash, terminal init, and optional ext modules.
- const LATEST_VER = 'v4.6.141';
+ const LATEST_VER = 'v4.6.143';
const CACHE = '?v=' + LATEST_VER;
// Exposed so ext modules can register their own URL with the same cache-busting version
// instead of an unversioned path the browser may already have cached (shell.js did).
diff --git a/modules/core/module-orchestrator.js b/modules/core/module-orchestrator.js
index 9f23ceb..6b8ee18 100644
--- a/modules/core/module-orchestrator.js
+++ b/modules/core/module-orchestrator.js
@@ -1116,13 +1116,21 @@ class OrchestratorModule {
if (r.status === 'fulfilled') {
// Find the agent that handled this sub-task
const agent = Object.values(this._agents).find(a => a.currentTask === sub.goal || (a.lastTask === sub.goal));
- if (agent) {
- const outbox = this.terminal.fs.fsReadJSON(`/agents/${agent.id}/outbox.json`);
- const snippet = outbox?.result ? outbox.result.substring(0, 200) : 'completed (no outbox)';
- summaries.push({ task: sub.goal, agent: agent.id, status: 'ok', result: snippet });
- } else {
- summaries.push({ task: sub.goal, status: 'ok', result: 'completed (agent recycled)' });
+ if (!agent) {
+ // "ok / completed (agent recycled)" told the caller a task succeeded
+ // when we could not even find its agent.
+ summaries.push({ task: sub.goal, status: 'failed', error: 'agent not found — result unverifiable' });
+ continue;
}
+ const outbox = this.terminal.fs.fsReadJSON(`/agents/${agent.id}/outbox.json`);
+ const body = outbox && typeof outbox.result === 'string' ? outbox.result : '';
+ const snippet = body.substring(0, 200);
+ summaries.push({
+ task: sub.goal, agent: agent.id,
+ status: body ? 'ok' : 'failed',
+ result: body || null,
+ error: body ? undefined : (outbox && outbox.error) || 'no result in outbox'
+ });
} else {
summaries.push({ task: sub.goal, status: 'failed', error: r.reason?.message || 'unknown error' });
}
@@ -1228,26 +1236,31 @@ class OrchestratorModule {
const _agentTag = agent.id + '/' + (agent.role || 'worker');
const result = await aiModule.chat([`[DELEGATED] ${task}`], { agentTag: _agentTag });
try { aiModule._sessions.delete(_agentTag); } catch (_e) {}
- agent.status = 'completed';
+ // chat() resolves {content, toolTurns}. Anything that is not a non-empty answer
+ // is a failure — the old code substituted the literal "completed", so a worker
+ // that returned nothing was indistinguishable from one that finished.
+ const _answer = typeof result === 'string' ? result : ((result && result.content) || '');
+ agent.status = _answer ? 'completed' : 'failed';
// Write result to outbox
this.terminal.fs.writeFile(`agents/${agent.id}/outbox.json`, JSON.stringify({
- result: typeof result === 'string' ? result : (result?.content || 'completed'),
- status: 'completed',
+ result: _answer || null,
+ status: _answer ? 'completed' : 'failed',
+ error: _answer ? null : 'agent produced no answer',
timestamp: new Date().toISOString()
}));
// Record in memory graph
const memgraph = this.terminal.moduleManager.modules['MemoryGraphModule'];
if (memgraph) {
- memgraph.recordTask(task, typeof result === 'string' ? result : (result?.content || ''), agent.id);
+ memgraph.recordTask(task, _answer, agent.id);
memgraph.recordFileAccess(`/agents/${agent.id}/outbox.json`);
}
this.terminal.print(`✅ ${agent.id} completed task`, 'success');
// Return result for callers that await delegateTask
- outboxResult = typeof result === 'string' ? result : (result?.content || 'completed');
+ outboxResult = _answer; // '' when the worker returned nothing; callers see that
// Check restart policy — if always, set back to idle for next task
if (agent.restartPolicy === 'always') {
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-06 19:52:15 +0000