@botlearn-course/daemon 0.0.7 → 0.0.9

package/README.md

@@ -14,16 +14,16 @@ Claude Code、Gemini 等）完成任务，并把过程事件与产出文件候
 
 ```bash
 # 1. 环境自检：探测各 runtime 的安装 / 版本 / 登录状态
-npx @botlearn-course/daemon@latest course doctor
+npx --yes --package @botlearn-course/daemon@latest botlearn-course-daemon course doctor
 
 # 2. 登录：用前端「我的 Daemon」页面生成的 install code 绑定本机
-npx @botlearn-course/daemon@latest course login --api-url <course-api-url> --code <blic_xxx> [--label <名称>]
+npx --yes --package @botlearn-course/daemon@latest botlearn-course-daemon course login --api-url <course-api-url> --code <blic_xxx> [--label <名称>]
 
 # 3. 启动：前台轮询并执行分配给本机的 run（Ctrl+C 优雅退出）
-npx @botlearn-course/daemon@latest course start [--once] [--poll-interval-ms <ms>]
+npx --yes --package @botlearn-course/daemon@latest botlearn-course-daemon course start [--once] [--poll-interval-ms <ms>]
 
 # 4. 登出：删除本机凭据文件
-npx @botlearn-course/daemon@latest course logout
+npx --yes --package @botlearn-course/daemon@latest botlearn-course-daemon course logout
 ```
 
 命令说明：
@@ -38,9 +38,10 @@ npx @botlearn-course/daemon@latest course logout
 
 包内还包含供 BotLearn 托管 E2B Template 使用的内部命令
 `botlearn-sandbox-supervisor agent-service session`。它不是 BYOA 用户入口：生产环境只允许由
-Agent Service 以固定 argv 启动，通过 stdin 接收一次性 bootstrap，并把 daemon/runtime 分别降权
-到 `botlearn-control`/`user` UID。E2B Template 通过 root-owned 固定 launcher 将 DeepSeek
-单向降权为 `user` 并设置 `no_new_privs`；runtime 用户本身没有 sudo 权限。托管启动链只执行
+Agent Service 以固定 argv 启动，通过 stdin 接收一次性 bootstrap。E2B 中 daemon/runtime 分别
+降权到 `botlearn-control`/`user` UID；继承 `NoNewPrivs=1`、无法使用 sudo 的平台保留 root control
+daemon，由 root-owned 固定 launcher 清空附加组后直接降权为 `user`。两条路径都为 DeepSeek
+设置 `no_new_privs`，runtime 用户本身没有 sudo 权限。托管启动链只执行
 `/opt` 下的固定 Node、supervisor、daemon、launcher 与 DeepSeek 文件，不信任 E2B 会开放给 runtime
 写入的 `/usr/local/bin`。
 `agent-service session --bootstrap-stdin` 同样属于受 supervisor 保护的内部协议，不应直接暴露给

package/dist/agent-service-client.js

@@ -17,8 +17,8 @@ export class AgentServiceRunClient {
     }
     url(path) {
         const base = this.baseUrl.replace(/\/+$/, "");
-        if (base.endsWith("/api/v1") && path.startsWith("/api/v1/")) {
-            return `${base}${path.slice("/api/v1".length)}`;
+        if (base.endsWith("/course/v1") && path.startsWith("/course/v1/")) {
+            return `${base}${path.slice("/course/v1".length)}`;
         }
         return `${base}${path}`;
     }
@@ -40,7 +40,7 @@ export class AgentServiceRunClient {
         return (raw ? JSON.parse(raw) : null);
     }
     async getRun() {
-        const payload = await this.request("GET", `/api/v1/agent-service/runs/${this.agentRunId}`);
+        const payload = await this.request("GET", `/course/v1/agent-service/runs/${this.agentRunId}`);
         this.traceId = payload.trace_id;
         return payload;
     }
@@ -48,14 +48,14 @@ export class AgentServiceRunClient {
         this.assertRunId(agentRunId);
         this.traceId = event.trace_id ?? this.traceId;
         const sanitized = redactSecretsDeep(event, 8, [this.runToken]);
-        await this.request("POST", `/api/v1/agent-service/runs/${agentRunId}/events`, sanitized);
+        await this.request("POST", `/course/v1/agent-service/runs/${agentRunId}/events`, sanitized);
     }
     async postFile(agentRunId, file) {
         this.assertRunId(agentRunId);
         const sanitized = redactSecretsDeep(file, 8, [this.runToken]);
         for (let attempt = 0; attempt < 3; attempt += 1) {
             try {
-                return await this.request("POST", `/api/v1/agent-service/runs/${agentRunId}/files`, sanitized);
+                return await this.request("POST", `/course/v1/agent-service/runs/${agentRunId}/files`, sanitized);
             }
             catch (err) {
                 const retryable = !(err instanceof CourseClientError) || err.status === 429 || err.status >= 500;
@@ -70,7 +70,7 @@ export class AgentServiceRunClient {
         this.assertRunId(agentRunId);
         const data = await readFile(absPath);
         assertNoInjectedCredentials(data, [this.runToken]);
-        const path = `/api/v1/agent-service/runs/${agentRunId}/files/${fileId}/content`;
+        const path = `/course/v1/agent-service/runs/${agentRunId}/files/${fileId}/content`;
         for (let attempt = 0; attempt < 3; attempt += 1) {
             let response;
             try {
@@ -102,10 +102,10 @@ export class AgentServiceRunClient {
     }
     async getRunRuntimeProfile(agentRunId) {
         this.assertRunId(agentRunId);
-        return this.request("GET", `/api/v1/agent-service/runs/${agentRunId}/runtime-profile`);
+        return this.request("GET", `/course/v1/agent-service/runs/${agentRunId}/runtime-profile`);
     }
     async heartbeat() {
-        await this.request("POST", `/api/v1/agent-service/runs/${this.agentRunId}/heartbeat`, { worker_id: this.workerId });
+        await this.request("POST", `/course/v1/agent-service/runs/${this.agentRunId}/heartbeat`, { worker_id: this.workerId });
     }
     assertRunId(value) {
         if (value !== this.agentRunId)

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

@@ -0,0 +1,108 @@
+import { type Logger } from "./log.js";
+import { type PersistentSessionExecution, type PreparedPersistentTurn, type RunReportingClient } from "./run-dispatcher.js";
+import type { CourseRuntime, CourseRuntimeProfile, RunEvent, RunFileCandidate, RunFileRecord, RunStartPayload } from "./types.js";
+export interface AgentServiceSandboxOptions {
+    wsUrl: string;
+    sandboxId: string;
+    sandboxToken: string;
+    runtimes: Map<string, CourseRuntime>;
+    daemonVersion: string;
+    log?: Logger;
+    random?: () => number;
+    sleep?: (ms: number) => Promise<void>;
+}
+/**
+ * Long-running daemon client for one user-scoped managed sandbox (ADR-015).
+ *
+ * 一个 sandbox 内可承载多个 runtime session（CourseRun Session）。server 通过显式命令帧
+ * （session.open/activate/close、turn.start/cancel、sandbox.drain/shutdown/sync）驱动；
+ * daemon 同时只允许一个 active session，且整个 sandbox 同时只有一个 active turn。
+ */
+export declare class AgentServiceSandboxClient implements RunReportingClient, PersistentSessionExecution {
+    private readonly options;
+    private readonly log;
+    private readonly random;
+    private readonly sleep;
+    private readonly state;
+    private readonly dispatcher;
+    /** agent_run_id → TURN scope（session/attempt/activation），事件与文件帧路由用。 */
+    private readonly turnScopes;
+    /** 每 run 内嵌 profile（turn payload 自带时优先）。 */
+    private readonly runProfiles;
+    /** activate 时装配的 per-session profile，turn.start 复用。 */
+    private readonly sessionProfiles;
+    /** activation-scoped 模型短凭据；只保存在内存中，绝不进入 state.json。 */
+    private readonly activationContexts;
+    private readonly pendingAcks;
+    private readonly pendingFilePrepares;
+    private readonly pendingFileCommits;
+    private readonly fileGrants;
+    private readonly inflightCommands;
+    private socket;
+    private sandboxGeneration;
+    private connectionEpoch;
+    private outboundSeq;
+    private inboundSeq;
+    private activeSessionId;
+    /** 全局串行下当前正在执行 turn 的 session（persistNativeSession 路由用）。 */
+    private currentTurnSessionId;
+    private heartbeatMs;
+    private staleMs;
+    private stopped;
+    private permanentFailure;
+    private lifecycleChain;
+    constructor(options: AgentServiceSandboxOptions);
+    prepareTurn(payload: RunStartPayload): PreparedPersistentTurn;
+    persistNativeSession(nativeSessionId: string): void;
+    finishTurn(payload: RunStartPayload): void;
+    private completePendingActivationCleanup;
+    private recoverPendingActivationCleanups;
+    run(): Promise<void>;
+    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;
+    private assertServerFrame;
+    private handleServerFrame;
+    /** sandbox.sync 只做对账：重放 spool、关闭待关 session、应用 drain/shutdown。 */
+    private applySync;
+    private handleSessionOpen;
+    private handleSessionActivate;
+    private handleTurnStart;
+    private handleTurnCancel;
+    /**
+     * 幂等关闭一个 runtime session：终止其 runtime 子进程、删除 workspace/native state、
+     * 清空本地状态分片，并回 session.closed。未知 session 直接回 closed。
+     */
+    private closeSession;
+    private reconcileInterruptedCommand;
+    private turnContextRevision;
+    private activationInstructions;
+    private validTurnPayload;
+    private scheduleLifecycle;
+    private currentLifecycleFence;
+    private isCurrentLifecycleFence;
+    private runIdsForSession;
+    private deactivateSession;
+    private sameTurnScope;
+    private matchesTurnScope;
+    private assertTurnScope;
+    private ackEventOrFile;
+    private acceptFileGrant;
+    private replaySpool;
+    private sendHeartbeat;
+    private sendCommandAck;
+    private sendControlFrame;
+    private sendSessionFrame;
+    private sendFrame;
+    private nextOutboundSeq;
+    private spoolFrameCount;
+    private spoolBytes;
+    private enforceSpoolLimit;
+    private rejectPending;
+    private rejectPendingFiles;
+    private persist;
+}