salmon-loop 0.2.3 → 0.2.13

package/dist/core/protocols/acp/permission-provider.js

@@ -60,6 +60,23 @@ function toToolCallUpdate(request) {
     };
 }
 export function createAcpToolAuthorizationProvider(params) {
+    const inProgressEmitted = new Set();
+    const emitInProgressBestEffort = async (toolCallId) => {
+        if (inProgressEmitted.has(toolCallId))
+            return;
+        inProgressEmitted.add(toolCallId);
+        try {
+            const update = {
+                sessionUpdate: 'tool_call_update',
+                toolCallId,
+                status: 'in_progress',
+            };
+            await params.conn.sessionUpdate({ sessionId: params.sessionId, update });
+        }
+        catch {
+            // Best-effort: do not block authorization if the client can't accept updates.
+        }
+    };
     return {
         async requestAuthorization(request) {
             const enforceClientCapabilities = params.enforceClientCapabilities ?? true;
@@ -86,6 +103,7 @@ export function createAcpToolAuthorizationProvider(params) {
             }
             const permissionPolicy = params.getPermissionPolicy?.() ?? 'ask';
             if (permissionPolicy === 'allow_all') {
+                await emitInProgressBestEffort(request.id);
                 return { outcome: 'allow_session', source: 'auto', reason: 'session_mode:yolo' };
             }
             const hasSideEffects = request.sideEffects.some((effect) => effect !== 'fs_read');
@@ -103,8 +121,10 @@ export function createAcpToolAuthorizationProvider(params) {
             }
             switch (response.outcome.optionId) {
                 case 'allow_once':
+                    await emitInProgressBestEffort(request.id);
                     return { outcome: 'allow_once', source: 'user' };
                 case 'allow_always':
+                    await emitInProgressBestEffort(request.id);
                     return { outcome: 'allow_session', source: 'user' };
                 case 'reject_once':
                 case 'reject_always':

package/dist/core/protocols/shared/execution-request.js

@@ -0,0 +1,24 @@
+export function normalizeInstructionText(instruction, options) {
+    const normalized = instruction.replace(/\r\n?/g, '\n').trim();
+    if (normalized.length > 0)
+        return normalized;
+    return options?.fallbackInstruction ?? '';
+}
+export function buildInstructionFromParts(parts, options) {
+    return normalizeInstructionText(parts.join('\n'), options);
+}
+export function buildCanonicalExecutionRequest(input) {
+    const request = {
+        instruction: normalizeInstructionText(input.instruction, {
+            fallbackInstruction: input.fallbackInstruction,
+        }),
+        checkpointSessionId: input.checkpointSessionId,
+        repoPath: input.repoPath,
+    };
+    return {
+        capability: input.capability,
+        request,
+        taskId: input.taskId,
+    };
+}
+//# sourceMappingURL=execution-request.js.map

package/dist/core/session/compression.js

@@ -178,7 +178,7 @@ export class SessionCompressor {
         return stats;
     }
     determineOutcome(iteration) {
-        // 简化的结果判断逻辑
+        // Simplified result determination logic
         if (iteration.result?.success === true)
             return 'success';
         if (iteration.result?.success === false)
@@ -186,7 +186,7 @@ export class SessionCompressor {
         return 'partial';
     }
     generateIterationSummary(iteration) {
-        // 生成迭代的简短摘要
+        // Generate brief iteration summary
         const result = iteration.result;
         if (!result)
             return 'No result data';
@@ -198,7 +198,7 @@ export class SessionCompressor {
         }
     }
     countErrors(iteration) {
-        // 计算迭代中的错误数量
+        // Count errors in iteration
         const result = iteration.result;
         if (!result)
             return 0;
@@ -313,7 +313,7 @@ export class CompressedSessionStore {
     }
     async readFile(path) {
         const data = await this.fileAdapter.readFile(path);
-        // FileAdapter返回base64字符串，需要解码为Uint8Array
+        // FileAdapter returns base64 string, need to decode to Uint8Array
         if (typeof data === 'string') {
             return new Uint8Array(Buffer.from(data, 'base64'));
         }

package/dist/core/session/manager.js

@@ -1,6 +1,7 @@
 import { randomBytes } from 'crypto';
 import { join } from 'path';
 import { FileAdapter } from '../adapters/fs/index.js';
+import { getLogger } from '../observability/logger.js';
 import { SessionCompressor, CompressedSessionStore } from './compression.js';
 import { SessionPruningEngine } from './pruning-strategy.js';
 /**
@@ -258,7 +259,7 @@ export class ChatSessionManager {
             }
             catch (error) {
                 // Skip corrupted session files
-                console.warn(`Failed to load session file ${file}:`, error);
+                getLogger().warn(`Failed to load session file ${file}: ${error}`);
             }
         }
         return sessions;
@@ -272,7 +273,7 @@ export class ChatSessionManager {
             await this.fileAdapter.deleteFile(filePath);
         }
         catch (error) {
-            console.warn(`Failed to delete session ${sessionId}:`, error);
+            getLogger().warn(`Failed to delete session ${sessionId}: ${error}`);
         }
     }
     /**

package/dist/core/strata/layers/worktree.js

@@ -101,17 +101,17 @@ export class WorkspaceManager {
             if (environmentMode === 'parity') {
                 const parityRoot = worktreeRootImpl.normalize(resolveParityWorktreeRoot(options.repoPath));
                 if (!isPathWithinDirectory(parityRoot, normalizedWorktreePath, { allowEqual: false })) {
-                    throw new Error('Worktree path must be under parity worktree root');
+                    throw new Error(text.errors.worktreePathMustBeUnderParityRoot);
                 }
             }
             else {
                 const tmpDir = worktreeRootImpl.normalize(tmpdir());
                 if (!isPathWithinDirectory(tmpDir, normalizedWorktreePath, { allowEqual: false })) {
-                    throw new Error('Worktree path must be in system temp directory');
+                    throw new Error(text.errors.worktreePathMustBeInTempDir);
                 }
             }
             if (isPathWithinDirectory(options.repoPath, worktreePath, { allowEqual: true })) {
-                throw new Error('Worktree path must not be inside repo path');
+                throw new Error(text.errors.worktreePathMustNotBeInsideRepo);
             }
             // Use GitAdapter for worktree creation
             await git.query(['worktree', 'add', '--quiet', '--detach', worktreePath, baseRef.trim()]);
@@ -225,7 +225,7 @@ export class WorkspaceManager {
         }
         if (!removed) {
             if (!isManagedWorktreePath(workspace.baseRepoPath, workspace.workPath)) {
-                throw new Error('Worktree path not in managed roots, refusing to delete');
+                throw new Error(text.errors.worktreePathNotInManagedRoots);
             }
             await rm(workspace.workPath, {
                 recursive: true,

package/dist/core/tools/builtin/fs.js

@@ -172,13 +172,13 @@ function toRepoRelativeChildPath(dir, name) {
 export async function executeFsList(input, ctx) {
     const { path: dir, includeHidden, maxEntries } = input;
     if (isAbsolute(dir)) {
-        throw new Error('Access denied: Path is outside of repository root.');
+        throw new Error(text.errors.pathOutsideRepo);
     }
     const absoluteRoot = resolve(ctx.repoRoot);
     const absolutePath = resolve(absoluteRoot, dir);
     const relPath = relative(absoluteRoot, absolutePath);
     if (relPath.startsWith('..') || isAbsolute(relPath)) {
-        throw new Error('Access denied: Path is outside of repository root.');
+        throw new Error(text.errors.pathOutsideRepo);
     }
     try {
         const dirents = await readdir(absolutePath, { withFileTypes: true });
@@ -217,7 +217,7 @@ export async function executeFsList(input, ctx) {
 export async function executeFsReadFile(input, ctx) {
     const { file } = input;
     if (isAbsolute(file)) {
-        throw new Error('Access denied: Path is outside of repository root.');
+        throw new Error(text.errors.pathOutsideRepo);
     }
     // CRITICAL SAFETY: Path traversal check using relative path resolution
     // We resolve to absolute paths to handle '.' and '..' correctly
@@ -226,7 +226,7 @@ export async function executeFsReadFile(input, ctx) {
     const absolutePath = resolve(absoluteRoot, file);
     const relPath = relative(absoluteRoot, absolutePath);
     if (relPath.startsWith('..') || isAbsolute(relPath)) {
-        throw new Error('Access denied: Path is outside of repository root.');
+        throw new Error(text.errors.pathOutsideRepo);
     }
     try {
         const fileStat = await stat(absolutePath);

package/dist/interfaces/cli/task-runner.js

@@ -1,10 +1,11 @@
+import { buildCanonicalExecutionRequest } from '../../core/protocols/shared/execution-request.js';
 export function createCliTaskRunner(deps) {
     return {
         async run(input) {
-            return deps.facade.createTask({
+            return deps.facade.createTask(buildCanonicalExecutionRequest({
                 capability: input.capability,
-                request: { instruction: input.instruction },
-            });
+                instruction: input.instruction,
+            }));
         },
     };
 }

package/dist/locales/en.js

@@ -86,6 +86,55 @@ export const en = {
         allowlistAtomicWriteBackupFailed: 'Allowlist atomic write backup failed.',
         allowlistAtomicRestoreFailed: 'Allowlist atomic restore failed.',
         allowlistPathBlocked: 'Allowlist blocked the requested path.',
+        // File system security errors
+        pathOutsideRepo: 'Access denied: Path is outside of repository root.',
+        // Worktree errors
+        worktreePathMustBeUnderParityRoot: 'Worktree path must be under parity worktree root',
+        worktreePathMustBeInTempDir: 'Worktree path must be in system temp directory',
+        worktreePathMustNotBeInsideRepo: 'Worktree path must not be inside repo path',
+        worktreePathNotInManagedRoots: 'Worktree path not in managed roots, refusing to delete',
+        // Shadow driver errors
+        aggressiveStrategyLinuxOnly: 'AGGRESSIVE strategy only supported on Linux',
+        commandTimedOut: 'Command timed out',
+        // Lock errors
+        failedToAcquireLock: 'Failed to acquire lock due to concurrent lock updates',
+        lockAcquisitionAborted: 'Lock acquisition aborted',
+        // Checkpoint errors
+        workspaceDirtyUseForce: 'Workspace is dirty. Use --force to overwrite.',
+        // Session errors
+        noActiveSession: 'No active session',
+        // Runtime errors
+        bunRuntimeNotAvailable: 'Bun runtime is not available',
+        runtimeAlreadyStarted: 'Runtime already started',
+        // Protocol errors
+        acpSessionPersistLockTimeout: 'ACP_SESSION_PERSIST_LOCK_TIMEOUT',
+        // Registry errors
+        subAgentRegistryNotInitialized: 'SubAgentRegistry is not initialized. Call setSubAgentRegistry() at startup.',
+        promptRegistryNotInitialized: 'PromptRegistry is not initialized. Call setPromptRegistry() at startup.',
+        pluginRegistryNotInitialized: 'PluginRegistry is not initialized. Call setPluginRegistry() at startup.',
+        monitorNotInitialized: 'Monitor is not initialized. Call setMonitor(createMonitor()) at startup.',
+        loggerNotInitialized: 'Logger is not initialized. Call setLogger(createLogger()) at startup.',
+        // Plan storage errors
+        invalidSessionId: 'Invalid sessionId (expected 6-64 chars of [a-zA-Z0-9_-]).',
+        invalidStepId: 'Invalid stepId.',
+        // Audit errors
+        invalidAuditFile: 'Invalid audit file: context.eventsRef.path is required',
+        // LLM errors
+        operationAborted: 'Operation aborted',
+        emptyLlmResponse: 'Empty LLM response',
+        streamAborted: 'Stream aborted',
+        // Worker errors
+        repoRootRequired: 'repoRoot context is required for union-merge reading',
+        patchContentEmpty: 'Patch content is empty',
+        // Transaction errors
+        runtimeEnvironmentMissingWorkspace: 'Runtime environment missing workspace after setup',
+        executionTerminatedWithoutReport: 'SalmonLoop execution terminated without a FlowReport',
+        // Decision engine errors
+        planBuilderContextNotBound: 'PlanBuilder: context not bound',
+        // Pipeline errors
+        operationCancelledByUser: 'Operation cancelled by user',
+        // Sub-agent errors
+        stopRequestedBeforeLaunch: 'Stop requested before launching Smallfry',
     },
     acp: {
         slashHelpDescription: 'Show available ACP slash commands',
@@ -617,6 +666,9 @@ Please return the patch in PURE unified diff format:`;
             findingItem: (index, summary, confidence, uncertainty) => `Finding ${index}: ${summary}${typeof confidence === 'number' ? ` (confidence: ${confidence})` : ''}${uncertainty ? ` [uncertainty: ${uncertainty}]` : ''}`,
         },
     },
+    intent: {
+        researchKeywords: ['deep research', 'research', 'investigate', 'investigation'],
+    },
     skills: {
         maxRetriesExceeded: (id) => `Max retries exceeded for skill: ${id}. Possible circular dependency in dynamic data.`,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "salmon-loop",
-  "version": "0.2.3",
+  "version": "0.2.13",
   "description": "A chat-first coding agent CLI for safe, reviewable repository changes",
   "type": "module",
   "bin": {
@@ -107,7 +107,7 @@
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.5",
-    "fast-check": "^4.5.3",
+    "fast-check": "^4.6.0",
     "jsdom": "^27.4.0",
     "prettier": "^3.4.2",
     "react-devtools-core": "^7.0.1",
@@ -138,7 +138,7 @@
     "ink-gradient": "^3.0.0",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
-    "marked": "^17.0.1",
+    "marked": "^16.4.2",
     "marked-terminal": "^7.3.0",
     "openai": "^6.16.0",
     "progress": "^2.0.3",