maka-agent 0.2.0-dev.30.20260912 → 0.2.0-dev.31.20260913

package/node_modules/@maka/runtime/dist/shell-tools.js

@@ -20,11 +20,9 @@ import { z } from 'zod';
 import { jsonSchema, zodSchema } from 'ai';
 import { encodedTerminalInputActionsByteLength, normalizeTerminalInputActionDefaults, parseTerminalInputAction, TERMINAL_INPUT_MODIFIERS, TERMINAL_INPUT_NAMED_KEYS, TERMINAL_MOUSE_BUTTONS, TERMINAL_MOUSE_EVENTS, TERMINAL_MOUSE_SCROLL_DIRECTIONS, } from '@maka/core/terminal-input';
 import { isActiveShellRunStatus } from '@maka/core/shell-run';
-import { redactSecrets } from '@maka/core/redaction';
 import { isLikelySandboxDenial } from './sandbox/detect.js';
 import { runShellWithBoundedTail } from './shell-exec.js';
 import { bashToolShellGuidance, bashToolTurnShellGuidance, defaultShellPlan, throwIfShellSetupFailed, } from './shell-detect.js';
-import { truncateToolOutput } from './tool-output.js';
 import { DEFAULT_BASH_TIMEOUT_MS, MAX_PTY_COLS, MAX_PTY_ROWS, MAX_FOREGROUND_BASH_TIMEOUT_MS, MAX_SHELL_RUN_RESOURCE_REF_CHARS, MAX_SHELL_RUN_TIMEOUT_MS, MAX_WRITE_STDIN_ACTIONS, MAX_WRITE_STDIN_INPUT_BYTES, MIN_PTY_COLS, MIN_PTY_ROWS, isShellRunResourceRef, isWellFormedTerminalInput, } from './shell-run-contract.js';
 import { bashToolResultToModelOutput } from './bash-model-output.js';
 import { BASH_REQUIRED_BOUNDARY_DESCRIPTION, bashBoundaryIntentSchema, preflightDeclaredSandboxBoundary, preprocessBashBoundaryDeclaration, refineBashBoundaryDeclaration, sandboxBoundaryExpansionSchema, selectedBashBoundaryExpansion, } from './sandbox-boundary-declaration.js';
@@ -473,23 +471,19 @@ function isEmptyProviderSize(value) {
         entries.every(([, field]) => field === undefined || field === null || field === 0));
 }
 export function shapeTerminalResult(input) {
-    const stdout = redactSecrets(input.result.stdout);
-    const stderr = redactSecrets(input.result.stderr);
-    const stdoutView = truncateToolOutput(stdout, { direction: 'tail' });
-    const stderrView = truncateToolOutput(stderr, { direction: 'tail' });
     return {
         kind: 'terminal',
         cwd: input.cwd,
-        cmd: redactSecrets(input.command),
+        cmd: input.command,
         status: terminalStatus(input.result),
         exitCode: input.result.exitCode,
         output: {
             mode: 'pipes',
-            stdout: stdoutView.content,
-            stderr: stderrView.content,
-            stdoutTruncated: Boolean(input.result.stdoutTruncated) || stdoutView.truncated,
-            stderrTruncated: Boolean(input.result.stderrTruncated) || stderrView.truncated,
-            redacted: stdout !== input.result.stdout || stderr !== input.result.stderr,
+            stdout: input.result.stdout,
+            stderr: input.result.stderr,
+            stdoutTruncated: Boolean(input.result.stdoutTruncated),
+            stderrTruncated: Boolean(input.result.stderrTruncated),
+            redacted: false,
         },
         ...(isLikelySandboxDenial({
             stdout: input.result.stdout,

package/node_modules/@maka/runtime/dist/tool-availability.js

@@ -32,7 +32,6 @@ export const TOOL_SEARCH_MAX_SCHEMA_CHARS = 64 * 1024;
 const DIRECT_TOOL_NAMES = new Set([
     'Bash',
     'Read',
-    'ArchiveRead',
     'Write',
     'Edit',
     'Glob',

package/node_modules/@maka/runtime/dist/tool-output.js

@@ -141,7 +141,7 @@ export function truncateToolOutput(text, options = {}) {
         return { content: text, truncated: false, removed: 0, unit: 'lines' };
     }
     const unit = hitBytes ? 'bytes' : 'lines';
-    const marker = `...${removed} ${unit} truncated. ${OUTPUT_RECOVERY_HINT} ` +
+    const marker = `...${removed} ${unit} truncated. ${options.recoveryHint ?? OUTPUT_RECOVERY_HINT} ` +
         'Otherwise work from the kept output above.';
     const content = direction === 'head' ? `${preview}\n\n${marker}` : `${marker}\n\n${preview}`;
     return { content, truncated: true, removed, unit };

package/node_modules/@maka/runtime/dist/tool-result-archive-capability.js

@@ -16,45 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
- * The tool-result archive is one capability, not three optional fields (#2026).
- *
- * When the context budget prunes a large tool result, the placeholder that
- * replaces it is a runtime-generated protocol value naming `ArchiveRead` as the
- * way back to the content. Writer, replay reader, ref-addressed reader and that
- * decoder tool therefore share one authority: a host either archives and can
- * read back, or does neither. Splitting them across backend options and tool
- * options made "writer on, decoder absent" representable, and it shipped twice
- * (#2025 and the child-agent path).
- *
- * Hosts supply only storage. The decoder travels with the capability and is
- * bound by the backend, so which host remembered to register a tool is no
- * longer part of the question.
- */
-import { ARCHIVE_READ_TOOL_NAME, buildArchiveReadTool } from './archive-read-tool.js';
-export { ARCHIVE_READ_TOOL_NAME };
+import { readToolResultArchiveResource, } from './tool-result-archive-resource.js';
+import { readParameters, resolveReadInput } from './read-page.js';
 export function createToolResultArchiveCapability(services) {
-    return Object.freeze({
-        services: Object.freeze({ ...services }),
-        archiveReadTool: buildArchiveReadTool({
-            readArchivedToolResultResource: services.readArchivedToolResultResource,
-        }),
-    });
+    return Object.freeze({ services: Object.freeze({ ...services }) });
 }
-/**
- * Add the decoder to a session's tool set when — and only when — that session
- * archives.
- *
- * No in-tree host binds `ArchiveRead` any more, so the dedup guard exists for
- * tool sets this runtime does not own: an embedder's custom tool, or an agent
- * definition that names it. Such a tool wins, which also means it — not this
- * capability — is what the placeholder's ref will be handed to. Advertising two
- * tools under one name would be worse.
- */
 export function bindToolResultArchiveDecoder(tools, capability) {
     if (!capability)
         return [...tools];
-    if (tools.some((tool) => tool.name === ARCHIVE_READ_TOOL_NAME))
-        return [...tools];
-    return [...tools, capability.archiveReadTool];
+    const existing = tools.find((tool) => tool.name === 'Read');
+    const read = {
+        ...existing,
+        name: 'Read',
+        activityKind: 'read',
+        description: existing
+            ? existing.description + ' Also accepts Maka tool-result paths returned in this session.'
+            : 'Read a Maka tool-result address returned in this session. offset and limit are optional zero-based line pagination. Use the returned next object to continue. File access is not available.',
+        parameters: readParameters,
+        impl: async (input, ctx) => {
+            const { path } = resolveReadInput(input);
+            const prefix = 'maka://runtime/tool-results/';
+            if (!path.startsWith(prefix)) {
+                if (existing)
+                    return existing.impl(input, ctx);
+                throw new Error('This Read tool only reads Maka tool-result addresses returned in this session. File access is not available.');
+            }
+            return readToolResultArchiveResource(capability.services, ctx.sessionId, input, ctx.abortSignal);
+        },
+    };
+    return [...tools.filter((tool) => tool.name !== 'Read'), read];
 }