@botlearn-course/daemon 0.0.9 → 0.0.11

package/README.md

@@ -99,9 +99,9 @@ runtime 凭据。
 - `auth.json` 是敏感凭据文件（0600），token 只存本机、只发给你 login 时指定的 Course API；
   日志、transcript、doctor 输出、错误信息在写出前都会经过脱敏（token / api key / 密码等
   字段与常见 token 形态一律替换为 `[REDACTED]`）。
-- 文件扫描只访问 workspace 内路径；包含 `..`、绝对路径或反斜杠的路径会被拒绝。本机
-  BYOA daemon 上报相对路径、大小、sha256 和脱敏 preview；Agent Service sandbox 还会在
-  终态前把完整文件上传到 Course Service 的受保护存储。
+- 文件扫描只访问 workspace 内路径；包含 `..`、绝对路径或反斜杠的路径会被拒绝。daemon
+  只上报相对路径、大小、sha256 和有界脱敏 preview，文件正文始终留在本地或托管 sandbox
+  的持久 workspace，不上传 Course Service 或对象存储。扫描或 metadata 上报失败不影响 run 终态。
 - 每个 run 在独立 workspace 内执行并有超时上限；runtime 进程在取消/超时后会被终止
   （SIGTERM → SIGKILL）。
 - `report_progress` MCP 子进程以 clean environment 启动，不继承 Course 控制字段或模型凭据；

package/dist/agent-service-client.d.ts

@@ -12,7 +12,6 @@ export declare class AgentServiceRunClient {
     getRun(): Promise<RunStartPayload>;
     postEvent(agentRunId: string, event: RunEvent): Promise<void>;
     postFile(agentRunId: string, file: RunFileCandidate): Promise<RunFileRecord>;
-    uploadFileContent(agentRunId: string, fileId: string, absPath: string, mimeType?: string): Promise<RunFileRecord>;
     getRunRuntimeProfile(agentRunId: string): Promise<CourseRuntimeProfile>;
     heartbeat(): Promise<void>;
     private assertRunId;

package/dist/agent-service-client.js

@@ -1,6 +1,5 @@
 import { CourseClientError } from "./course-client.js";
-import { readFile } from "node:fs/promises";
-import { assertNoInjectedCredentials, redactSecretString, redactSecretsDeep, } from "./redaction.js";
+import { redactSecretString, redactSecretsDeep, } from "./redaction.js";
 const ERROR_BODY_MAX_CHARS = 500;
 /** Run-scoped client used only inside an Agent Service sandbox. */
 export class AgentServiceRunClient {
@@ -66,40 +65,6 @@ export class AgentServiceRunClient {
         }
         throw new Error("unreachable");
     }
-    async uploadFileContent(agentRunId, fileId, absPath, mimeType) {
-        this.assertRunId(agentRunId);
-        const data = await readFile(absPath);
-        assertNoInjectedCredentials(data, [this.runToken]);
-        const path = `/course/v1/agent-service/runs/${agentRunId}/files/${fileId}/content`;
-        for (let attempt = 0; attempt < 3; attempt += 1) {
-            let response;
-            try {
-                response = await fetch(this.url(path), {
-                    method: "PUT",
-                    headers: {
-                        authorization: `Bearer ${this.runToken}`,
-                        ...(this.traceId ? { "x-trace-id": this.traceId } : {}),
-                        "content-type": mimeType ?? "application/octet-stream",
-                    },
-                    body: data,
-                });
-            }
-            catch (err) {
-                if (attempt === 2)
-                    throw err;
-                await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
-                continue;
-            }
-            if (response.ok)
-                return (await response.json());
-            const text = await response.text().catch(() => "");
-            const error = new CourseClientError(response.status, `PUT ${path} -> ${response.status} ${redactSecretString(text.slice(0, ERROR_BODY_MAX_CHARS))}`);
-            if (attempt === 2 || (response.status !== 429 && response.status < 500))
-                throw error;
-            await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
-        }
-        throw new Error("unreachable");
-    }
     async getRunRuntimeProfile(agentRunId) {
         this.assertRunId(agentRunId);
         return this.request("GET", `/course/v1/agent-service/runs/${agentRunId}/runtime-profile`);

package/dist/agent-service-sandbox.d.ts

@@ -34,9 +34,7 @@ export declare class AgentServiceSandboxClient implements RunReportingClient, Pe
     /** activation-scoped 模型短凭据；只保存在内存中，绝不进入 state.json。 */
     private readonly activationContexts;
     private readonly pendingAcks;
-    private readonly pendingFilePrepares;
-    private readonly pendingFileCommits;
-    private readonly fileGrants;
+    private readonly pendingFileReports;
     private readonly inflightCommands;
     private socket;
     private sandboxGeneration;
@@ -61,7 +59,6 @@ export declare class AgentServiceSandboxClient implements RunReportingClient, Pe
     stop(): void;
     postEvent(agentRunId: string, event: RunEvent): Promise<void>;
     postFile(agentRunId: string, file: RunFileCandidate): Promise<RunFileRecord>;
-    uploadFileContent(agentRunId: string, fileId: string, absPath: string, mimeType?: string): Promise<RunFileRecord>;
     getRunRuntimeProfile(agentRunId: string): Promise<CourseRuntimeProfile>;
     private connectOnce;
     private handleHello;
@@ -91,7 +88,6 @@ export declare class AgentServiceSandboxClient implements RunReportingClient, Pe
     private matchesTurnScope;
     private assertTurnScope;
     private ackEventOrFile;
-    private acceptFileGrant;
     private replaySpool;
     private sendHeartbeat;
     private sendCommandAck;

package/dist/agent-service-sandbox.js

@@ -1,12 +1,11 @@
 import { chmodSync, closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, writeFileSync, } from "node:fs";
-import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { ensureDaemonHome } from "./auth-store.js";
 import { AGENT_SERVICE_WS_SCHEMA, AGENT_SERVICE_WS_SUBPROTOCOL, createSandboxFrame, parseSandboxFrame, UnsupportedSandboxProtocolError, } from "./agent-service-ws-protocol.js";
 import { log as defaultLog } from "./log.js";
 import { availableRunCapabilities } from "./runtime-capabilities.js";
 import { activationRuntimeEnv, runtimeChildEnv } from "./runtime-env.js";
-import { assertNoInjectedCredentials, redactSecretString } from "./redaction.js";
+import { redactSecretString } from "./redaction.js";
 import { RunDispatcher, } from "./run-dispatcher.js";
 import { ensureRuntimeSessionDirectories, ensureRuntimeSessionWorkspace, exposeRuntimeSessionWorkspace, removeRuntimeSessionWorkspace, revokeRuntimeSessionWorkspace, } from "./workspace.js";
 import { WebSocketClient, } from "./websocket-client.js";
@@ -226,9 +225,7 @@ export class AgentServiceSandboxClient {
     /** activation-scoped 模型短凭据；只保存在内存中，绝不进入 state.json。 */
     activationContexts = new Map();
     pendingAcks = new Map();
-    pendingFilePrepares = new Map();
-    pendingFileCommits = new Map();
-    fileGrants = new Map();
+    pendingFileReports = new Map();
     inflightCommands = new Set();
     socket = null;
     sandboxGeneration = 0;
@@ -332,10 +329,6 @@ export class AgentServiceSandboxClient {
         this.turnScopes.delete(payload.agent_run_id);
         if (this.currentTurnSessionId === scope.sessionId)
             this.currentTurnSessionId = null;
-        for (const [key, grant] of this.fileGrants) {
-            if (this.sameTurnScope(scope, grant.scope))
-                this.fileGrants.delete(key);
-        }
         this.persist();
     }
     completePendingActivationCleanup(sessionId) {
@@ -369,12 +362,6 @@ export class AgentServiceSandboxClient {
             this.activeSessionId = null;
         if (this.currentTurnSessionId === sessionId)
             this.currentTurnSessionId = null;
-        for (const [key, grant] of this.fileGrants) {
-            if (grant.scope.sessionId === sessionId &&
-                grant.scope.workerAttempt === pending.workerAttempt &&
-                grant.scope.activationId === pending.activationId)
-                this.fileGrants.delete(key);
-        }
         this.persist();
     }
     recoverPendingActivationCleanups() {
@@ -483,7 +470,7 @@ export class AgentServiceSandboxClient {
             throw new Error("Agent Service sandbox file requires size_bytes and sha256");
         }
         const frame = createSandboxFrame({
-            type: "turn.file.prepare",
+            type: "turn.file.report",
             sandboxId: this.options.sandboxId,
             sandboxGeneration: this.sandboxGeneration,
             connectionEpoch: this.connectionEpoch,
@@ -494,73 +481,15 @@ export class AgentServiceSandboxClient {
             activationId: scope.activationId,
             payload: file,
         });
-        const prepared = new Promise((resolve, reject) => {
-            this.pendingFilePrepares.set(frame.frame_id, {
+        const reported = new Promise((resolve, reject) => {
+            this.pendingFileReports.set(frame.frame_id, {
                 scope: { ...scope },
                 resolve,
                 reject,
             });
         });
         await this.sendFrame(frame);
-        const grant = await prepared;
-        this.fileGrants.set(`${agentRunId}:${grant.record.id}`, grant);
-        return grant.record;
-    }
-    async uploadFileContent(agentRunId, fileId, absPath, mimeType) {
-        const scope = this.turnScopes.get(agentRunId);
-        if (!scope)
-            throw new Error("Agent Service sandbox file has no active turn scope");
-        const key = `${agentRunId}:${fileId}`;
-        const grant = this.fileGrants.get(key);
-        if (!grant)
-            throw new Error("Agent Service sandbox file has no upload grant");
-        if (!this.sameTurnScope(scope, grant.scope)) {
-            throw new Error("Agent Service sandbox file grant turn scope mismatch");
-        }
-        const data = await readFile(absPath);
-        assertNoInjectedCredentials(data, [
-            this.state.reconnectToken,
-            grant.uploadGrant,
-            ...Object.values(this.activationContexts.get(scope.sessionId)?.runtimeEnv ?? {}),
-        ]);
-        const response = await fetch(grant.uploadUrl, {
-            method: "PUT",
-            headers: {
-                authorization: `Bearer ${grant.uploadGrant}`,
-                "content-type": mimeType ?? grant.record.mime_type ?? "application/octet-stream",
-            },
-            body: data,
-        });
-        if (!response.ok) {
-            const text = await response.text().catch(() => "");
-            throw new Error(`Agent Service file upload failed (${response.status}): ${redactSecretString(text.slice(0, 500))}`);
-        }
-        const frame = createSandboxFrame({
-            type: "turn.file.committed",
-            sandboxId: this.options.sandboxId,
-            sandboxGeneration: this.sandboxGeneration,
-            connectionEpoch: this.connectionEpoch,
-            seq: this.nextOutboundSeq(),
-            runtimeSessionId: scope.sessionId,
-            agentRunId,
-            workerAttempt: scope.workerAttempt,
-            activationId: scope.activationId,
-            payload: { file_id: fileId, sha256: grant.record.sha256 },
-        });
-        const committed = new Promise((resolve, reject) => {
-            this.pendingFileCommits.set(frame.frame_id, {
-                scope: { ...scope },
-                resolve,
-                reject,
-            });
-        });
-        await this.sendFrame(frame);
-        try {
-            return await committed;
-        }
-        finally {
-            this.fileGrants.delete(key);
-        }
+        return await reported;
     }
     async getRunRuntimeProfile(agentRunId) {
         const embedded = this.runProfiles.get(agentRunId);
@@ -724,9 +653,6 @@ export class AgentServiceSandboxClient {
             case "event.ack":
                 this.ackEventOrFile(frame);
                 return;
-            case "turn.file.upload_grant":
-                this.acceptFileGrant(frame);
-                return;
             case "ping":
                 await this.sendControlFrame("pong", { ping_frame_id: frame.frame_id });
                 return;
@@ -1229,13 +1155,13 @@ export class AgentServiceSandboxClient {
         const frameId = frame.payload.frame_id;
         if (typeof frameId !== "string")
             throw new Error("event.ack has no frame_id");
-        const pendingFile = this.pendingFileCommits.get(frameId);
+        const pendingFile = this.pendingFileReports.get(frameId);
         if (pendingFile) {
-            this.assertTurnScope(frame, pendingFile.scope, "file commit ACK");
-            this.pendingFileCommits.delete(frameId);
+            this.assertTurnScope(frame, pendingFile.scope, "file report ACK");
+            this.pendingFileReports.delete(frameId);
             const file = frame.payload.file;
             if (!file || typeof file !== "object" || Array.isArray(file)) {
-                pendingFile.reject(new Error("file commit ACK has no file record"));
+                pendingFile.reject(new Error("file report ACK has no file record"));
             }
             else {
                 pendingFile.resolve(file);
@@ -1264,35 +1190,6 @@ export class AgentServiceSandboxClient {
             pending.resolve();
         }
     }
-    acceptFileGrant(frame) {
-        const requestFrameId = frame.payload.request_frame_id;
-        if (typeof requestFrameId !== "string")
-            throw new Error("file grant has no request_frame_id");
-        const pending = this.pendingFilePrepares.get(requestFrameId);
-        if (!pending)
-            return;
-        this.assertTurnScope(frame, pending.scope, "file upload grant");
-        this.pendingFilePrepares.delete(requestFrameId);
-        const file = frame.payload.file;
-        const uploadUrl = frame.payload.upload_url;
-        const uploadGrant = frame.payload.upload_grant;
-        if (!file ||
-            typeof file !== "object" ||
-            Array.isArray(file) ||
-            typeof uploadUrl !== "string" ||
-            !uploadUrl ||
-            typeof uploadGrant !== "string" ||
-            !uploadGrant) {
-            pending.reject(new Error("invalid Agent Service file upload grant"));
-            return;
-        }
-        pending.resolve({
-            scope: pending.scope,
-            record: file,
-            uploadUrl,
-            uploadGrant,
-        });
-    }
     async replaySpool() {
         for (const session of Object.values(this.state.sessions)) {
             for (const original of session.spool) {
@@ -1386,13 +1283,9 @@ export class AgentServiceSandboxClient {
         this.rejectPendingFiles(error);
     }
     rejectPendingFiles(error) {
-        for (const pending of this.pendingFilePrepares.values())
-            pending.reject(error);
-        this.pendingFilePrepares.clear();
-        for (const pending of this.pendingFileCommits.values())
+        for (const pending of this.pendingFileReports.values())
             pending.reject(error);
-        this.pendingFileCommits.clear();
-        this.fileGrants.clear();
+        this.pendingFileReports.clear();
     }
     persist() {
         saveState(this.options.sandboxId, this.state);

package/dist/agent-service-ws-protocol.d.ts

@@ -1,6 +1,6 @@
 export declare const AGENT_SERVICE_WS_SCHEMA: "botlearn-agent-sandbox-ws/0.2";
 export declare const AGENT_SERVICE_WS_SUBPROTOCOL: "botlearn-agent-sandbox.v2";
-export type SandboxFrameType = "sandbox.hello" | "sandbox.sync" | "session.open" | "session.activate" | "turn.start" | "turn.cancel" | "session.close" | "sandbox.drain" | "sandbox.shutdown" | "event.ack" | "turn.file.upload_grant" | "auth.rotate" | "ping" | "sandbox.ready" | "sandbox.heartbeat" | "command.ack" | "session.opened" | "session.closed" | "turn.event" | "turn.file.prepare" | "turn.file.committed" | "sandbox.drained" | "pong" | "protocol.error";
+export type SandboxFrameType = "sandbox.hello" | "sandbox.sync" | "session.open" | "session.activate" | "turn.start" | "turn.cancel" | "session.close" | "sandbox.drain" | "sandbox.shutdown" | "event.ack" | "auth.rotate" | "ping" | "sandbox.ready" | "sandbox.heartbeat" | "command.ack" | "session.opened" | "session.closed" | "turn.event" | "turn.file.report" | "sandbox.drained" | "pong" | "protocol.error";
 export declare class UnsupportedSandboxProtocolError extends Error {
     readonly schemaVersion: unknown;
     constructor(schemaVersion: unknown);

package/dist/agent-service-ws-protocol.js

@@ -12,7 +12,6 @@ const FRAME_TYPES = new Set([
     "sandbox.drain",
     "sandbox.shutdown",
     "event.ack",
-    "turn.file.upload_grant",
     "auth.rotate",
     "ping",
     "sandbox.ready",
@@ -21,8 +20,7 @@ const FRAME_TYPES = new Set([
     "session.opened",
     "session.closed",
     "turn.event",
-    "turn.file.prepare",
-    "turn.file.committed",
+    "turn.file.report",
     "sandbox.drained",
     "pong",
     "protocol.error",
@@ -40,10 +38,8 @@ const TURN_TYPES = new Set([
     "turn.start",
     "turn.cancel",
     "event.ack",
-    "turn.file.upload_grant",
     "turn.event",
-    "turn.file.prepare",
-    "turn.file.committed",
+    "turn.file.report",
 ]);
 const FRAME_KEYS = new Set([
     "schema_version",

package/dist/file-candidates.d.ts

@@ -1,21 +1,20 @@
 import type { Logger } from "./log.js";
-import type { RunFileCandidate, RunFileRecord } from "./types.js";
+import type { RunFileCandidate } from "./types.js";
 export interface ScanLimits {
     maxFiles?: number;
     maxFileBytes?: number;
     maxPreviewChars?: number;
     maxDepth?: number;
+    maxReportMs?: number;
 }
 export interface ScannedFile extends RunFileCandidate {
     absPath: string;
 }
 export interface FileReportingClient {
-    postFile(agentRunId: string, file: RunFileCandidate): Promise<RunFileRecord | void>;
-    uploadFileContent?(agentRunId: string, fileId: string, absPath: string, mimeType?: string): Promise<RunFileRecord>;
+    postFile(agentRunId: string, file: RunFileCandidate): Promise<unknown>;
 }
 export interface FileReportResult {
     reported: number;
-    uploaded: number;
     failed: number;
     truncated: boolean;
 }

package/dist/file-candidates.js

@@ -9,6 +9,7 @@ const DEFAULT_MAX_FILE_BYTES = 50 * 1024 * 1024;
 // 与后端 MAX_PREVIEW_CHARS 一致。
 const DEFAULT_MAX_PREVIEW_CHARS = 4000;
 const DEFAULT_MAX_DEPTH = 8;
+const DEFAULT_MAX_REPORT_MS = 3_000;
 // 文本启发式：前 4KiB 不含 NUL 字节即视为文本，可取 preview。
 const TEXT_SNIFF_BYTES = 4096;
 // 与后端 _is_safe_relative_path 同规：非空、非绝对、无反斜杠、无 .. 段、无空段。
@@ -147,18 +148,24 @@ export async function reportFileCandidates(client, agentRunId, workspaceDir, log
         log.warn("workspace file scan truncated", { agentRunId, reported: files.length });
     }
     let reported = 0;
-    let uploaded = 0;
     let failed = 0;
-    for (const { absPath, ...candidate } of files) {
+    const reportDeadline = Date.now() + (limits?.maxReportMs ?? DEFAULT_MAX_REPORT_MS);
+    for (const { absPath: _absPath, ...candidate } of files) {
+        const remainingMs = reportDeadline - Date.now();
+        if (remainingMs <= 0) {
+            failed += files.length - reported - failed;
+            log.warn("workspace file metadata report timed out", { agentRunId, reported });
+            break;
+        }
+        let timeout;
         try {
-            const record = await client.postFile(agentRunId, candidate);
+            await Promise.race([
+                client.postFile(agentRunId, candidate),
+                new Promise((_resolve, reject) => {
+                    timeout = setTimeout(() => reject(new Error("workspace file metadata report timed out")), remainingMs);
+                }),
+            ]);
             reported += 1;
-            if (client.uploadFileContent) {
-                if (!record)
-                    throw new Error("file candidate response is missing its id");
-                await client.uploadFileContent(agentRunId, record.id, absPath, candidate.mime_type);
-                uploaded += 1;
-            }
         }
         catch (err) {
             failed += 1;
@@ -168,6 +175,10 @@ export async function reportFileCandidates(client, agentRunId, workspaceDir, log
                 error: err instanceof Error ? err.message : String(err),
             });
         }
+        finally {
+            if (timeout !== undefined)
+                clearTimeout(timeout);
+        }
     }
-    return { reported, uploaded, failed, truncated };
+    return { reported, failed, truncated };
 }

package/dist/run-dispatcher.d.ts

@@ -1,6 +1,6 @@
 import { type ScanLimits } from "./file-candidates.js";
 import { type Logger } from "./log.js";
-import { type CourseRuntimeProfile, type CourseRuntime, type RunEvent, type RunFileRecord, type RunStartPayload } from "./types.js";
+import { type CourseRuntimeProfile, type CourseRuntime, type RunEvent, type RunStartPayload } from "./types.js";
 export interface RunDispatcherOptions {
     defaultRuntimeId?: string;
     log?: Logger;
@@ -22,8 +22,7 @@ export interface PersistentSessionExecution {
 }
 export interface RunReportingClient {
     postEvent(agentRunId: string, event: RunEvent): Promise<void>;
-    postFile(agentRunId: string, file: import("./types.js").RunFileCandidate): Promise<RunFileRecord | void>;
-    uploadFileContent?(agentRunId: string, fileId: string, absPath: string, mimeType?: string): Promise<RunFileRecord>;
+    postFile(agentRunId: string, file: import("./types.js").RunFileCandidate): Promise<unknown>;
     getRunRuntimeProfile?(agentRunId: string): Promise<CourseRuntimeProfile>;
 }
 /**

package/dist/run-dispatcher.js

@@ -183,8 +183,8 @@ export class RunDispatcher {
         let runtimeUsage = {};
         let modelStartedAt;
         let modelFinishedAt;
-        let filePersistStartedAt;
-        let filePersistFinishedAt;
+        let fileReportStartedAt;
+        let fileReportFinishedAt;
         let progressEvents = 0;
         let transcript;
         let lastProgressKey = null;
@@ -219,9 +219,9 @@ export class RunDispatcher {
                 ...(modelStartedAt !== undefined && modelFinishedAt !== undefined
                     ? { model_wall_time_ms: Math.max(0, modelFinishedAt - modelStartedAt) }
                     : {}),
-                ...(filePersistStartedAt !== undefined && filePersistFinishedAt !== undefined
+                ...(fileReportStartedAt !== undefined && fileReportFinishedAt !== undefined
                     ? {
-                        file_persist_time_ms: Math.max(0, filePersistFinishedAt - filePersistStartedAt),
+                        file_report_time_ms: Math.max(0, fileReportFinishedAt - fileReportStartedAt),
                     }
                     : {}),
             };
@@ -658,18 +658,12 @@ export class RunDispatcher {
                 : DEFAULT_MAX_OUTPUT_CHARS;
             const output = redactSecretString(truncateText(finalText, maxOutputChars));
             activeTranscript.writeFinal(output);
-            filePersistStartedAt = this.now();
-            let fileReport;
+            fileReportStartedAt = this.now();
             try {
-                fileReport = await reportFileCandidates(this.client, runId, workspaceDir, this.log, this.scanLimits);
+                await reportFileCandidates(this.client, runId, workspaceDir, this.log, this.scanLimits);
             }
             finally {
-                filePersistFinishedAt = this.now();
-            }
-            if (this.client.uploadFileContent && (fileReport.failed > 0 || fileReport.truncated)) {
-                throw new RuntimeExecutionError(fileReport.truncated
-                    ? "workspace file collection was truncated"
-                    : `failed to persist ${fileReport.failed} workspace file(s)`);
+                fileReportFinishedAt = this.now();
             }
             await send({ type: "run.message", role: "assistant", text: output });
             await sendTerminal({

package/dist/types.d.ts

@@ -58,7 +58,7 @@ export interface RunEvent {
 }
 /** `POST /daemon/runs/{id}/files` 的文件候选（与后端 DaemonRunFileIn 一致）。 */
 export interface RunFileCandidate {
-    event?: "created" | "modified" | "deleted" | "upload_completed" | "upload_failed";
+    event?: "created" | "modified" | "deleted";
     /** workspace 相对路径，正斜杠；不得包含 `..`、绝对路径或反斜杠（后端 400）。 */
     path: string;
     name?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botlearn-course/daemon",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Lightweight BotLearn Course daemon: run course tasks on your own machine with your own agent runtime (BYOA).",
   "type": "module",
   "bin": {