@botlearn-course/daemon 0.0.6 → 0.0.8

package/dist/workspace.js

@@ -1,4 +1,4 @@
-import { chmodSync, existsSync, mkdirSync } from "node:fs";
+import { chmodSync, mkdirSync, rmSync } from "node:fs";
 import path from "node:path";
 import { daemonHome } from "./auth-store.js";
 /**
@@ -42,34 +42,51 @@ export function runtimeProfileDir(agentRunId) {
 export function runtimeProfileRunRootDir(agentRunId) {
     return path.dirname(runtimeProfileDir(agentRunId));
 }
-export function runtimeSessionRootDir(runtimeSessionId, sessionGeneration) {
+export function runtimeSessionRootDir(runtimeSessionId, sandboxGeneration) {
     assertSafeId(runtimeSessionId, "runtime_session_id");
-    if (!Number.isInteger(sessionGeneration) || sessionGeneration < 1) {
-        throw new Error("unsafe session_generation: expected a positive integer");
+    if (!Number.isInteger(sandboxGeneration) || sandboxGeneration < 1) {
+        throw new Error("unsafe sandbox_generation: expected a positive integer");
     }
-    return path.join(daemonHome(), "agent-service-sessions", runtimeSessionId, `generation-${sessionGeneration}`);
+    return path.join(daemonHome(), "agent-service-sessions", runtimeSessionId, `generation-${sandboxGeneration}`);
 }
-export function runtimeSessionWorkspaceDir(runtimeSessionId, sessionGeneration) {
+/**
+ * per-session workspace（ADR-015 §7）：managed sandbox 下为
+ * `<BOTLEARN_AGENT_SERVICE_WORKSPACE_ROOT>/<runtime_session_id>/generation-<sandbox_generation>`，
+ * 由 daemon 在 session.open 时创建。
+ */
+export function runtimeSessionWorkspaceDir(runtimeSessionId, sandboxGeneration) {
+    assertSafeId(runtimeSessionId, "runtime_session_id");
+    if (!Number.isInteger(sandboxGeneration) || sandboxGeneration < 1) {
+        throw new Error("unsafe sandbox_generation: expected a positive integer");
+    }
     const managedRoot = process.env.BOTLEARN_AGENT_SERVICE_WORKSPACE_ROOT?.trim();
     if (managedRoot) {
-        return path.join(managedRoot, runtimeSessionId, `generation-${sessionGeneration}`);
+        return path.join(managedRoot, runtimeSessionId, `generation-${sandboxGeneration}`);
     }
-    return path.join(runtimeSessionRootDir(runtimeSessionId, sessionGeneration), "workspace");
+    return path.join(runtimeSessionRootDir(runtimeSessionId, sandboxGeneration), "workspace");
+}
+function managedRuntimeSessionParentDir(runtimeSessionId) {
+    assertSafeId(runtimeSessionId, "runtime_session_id");
+    const managedRoot = process.env.BOTLEARN_AGENT_SERVICE_WORKSPACE_ROOT?.trim();
+    return managedRoot ? path.join(managedRoot, runtimeSessionId) : null;
 }
-export function runtimeSessionTranscriptPath(runtimeSessionId, sessionGeneration, agentRunId) {
+export function runtimeSessionTranscriptPath(runtimeSessionId, sandboxGeneration, agentRunId) {
     assertSafeId(agentRunId, "agent_run_id");
-    return path.join(runtimeSessionRootDir(runtimeSessionId, sessionGeneration), "transcripts", `${agentRunId}.jsonl`);
+    return path.join(runtimeSessionRootDir(runtimeSessionId, sandboxGeneration), "transcripts", `${agentRunId}.jsonl`);
 }
 // recursive mkdir 只对新建目录生效 mode，已存在目录需 best-effort 收紧。
-function mkdirTolerant(dir) {
-    mkdirSync(dir, { recursive: true, mode: 0o700 });
+function mkdirTolerant(dir, mode = 0o700) {
+    mkdirSync(dir, { recursive: true, mode });
     try {
-        chmodSync(dir, 0o700);
+        chmodSync(dir, mode);
     }
     catch {
         // Windows 等不支持 chmod 时忽略。
     }
 }
+function isMissingPathError(error) {
+    return error instanceof Error && "code" in error && error.code === "ENOENT";
+}
 export function ensureRunWorkspace(agentRunId) {
     const rootDir = runRootDir(agentRunId);
     const workspaceDir = runWorkspaceDir(agentRunId);
@@ -77,19 +94,75 @@ export function ensureRunWorkspace(agentRunId) {
     mkdirTolerant(workspaceDir);
     return { rootDir, workspaceDir };
 }
-export function ensureRuntimeSessionWorkspace(runtimeSessionId, sessionGeneration, agentRunId) {
-    const rootDir = runtimeSessionRootDir(runtimeSessionId, sessionGeneration);
-    const workspaceDir = runtimeSessionWorkspaceDir(runtimeSessionId, sessionGeneration);
-    const transcriptFile = runtimeSessionTranscriptPath(runtimeSessionId, sessionGeneration, agentRunId);
+/**
+ * session.open 时创建 per-session 目录。managed workspace 默认保持 0700，只有当前
+ * activation 会通过 exposeRuntimeSessionWorkspace() 临时开放给 runtime 组。
+ */
+export function ensureRuntimeSessionDirectories(runtimeSessionId, sandboxGeneration) {
+    const rootDir = runtimeSessionRootDir(runtimeSessionId, sandboxGeneration);
+    const workspaceDir = runtimeSessionWorkspaceDir(runtimeSessionId, sandboxGeneration);
     mkdirTolerant(rootDir);
-    if (process.env.BOTLEARN_AGENT_SERVICE_WORKSPACE_ROOT?.trim()) {
-        if (!existsSync(workspaceDir)) {
-            throw new Error("managed runtime session workspace was not prepared by the supervisor");
-        }
+    const managedParent = managedRuntimeSessionParentDir(runtimeSessionId);
+    if (managedParent)
+        mkdirTolerant(managedParent, 0o700);
+    mkdirTolerant(workspaceDir, 0o700);
+    return { rootDir, workspaceDir };
+}
+/**
+ * 暴露当前 activation 的 managed workspace。sandbox 根目录由 supervisor 设为
+ * 0710，因此 runtime 只能穿过根目录，不能列举其他 session id；未激活 session
+ * 的父目录与 workspace 始终为 0700。
+ */
+export function exposeRuntimeSessionWorkspace(runtimeSessionId, sandboxGeneration) {
+    const managedParent = managedRuntimeSessionParentDir(runtimeSessionId);
+    if (!managedParent)
+        return;
+    const { workspaceDir } = ensureRuntimeSessionDirectories(runtimeSessionId, sandboxGeneration);
+    // Parent is traverse-only for the runtime group: allowing group write here would let
+    // the runtime replace the generation directory with a symlink before revoke/cleanup.
+    chmodSync(managedParent, 0o710);
+    chmodSync(workspaceDir, 0o770);
+}
+/** Revoke a managed workspace without deleting the session's durable local materialization. */
+export function revokeRuntimeSessionWorkspace(runtimeSessionId, sandboxGeneration) {
+    const managedParent = managedRuntimeSessionParentDir(runtimeSessionId);
+    if (!managedParent)
+        return;
+    const workspaceDir = runtimeSessionWorkspaceDir(runtimeSessionId, sandboxGeneration);
+    // Revoke the leaf before the parent so a runtime loses access as early as possible.
+    try {
+        chmodSync(workspaceDir, 0o700);
+    }
+    catch (error) {
+        // session.close / generation cleanup may already have removed it. Permission and I/O
+        // failures must remain visible: proceeding would leave an inactive workspace exposed.
+        if (!isMissingPathError(error))
+            throw error;
+    }
+    try {
+        chmodSync(managedParent, 0o700);
+    }
+    catch (error) {
+        if (!isMissingPathError(error))
+            throw error;
     }
-    else {
-        mkdirTolerant(workspaceDir);
+}
+/** session.close 时删除 workspace 与本地 session 物化状态（transcripts 等）。幂等。 */
+export function removeRuntimeSessionWorkspace(runtimeSessionId, sandboxGeneration) {
+    // 校验路径段安全后按 session 整体删除（含全部 generation 与 transcripts）。
+    runtimeSessionRootDir(runtimeSessionId, sandboxGeneration);
+    rmSync(path.join(daemonHome(), "agent-service-sessions", runtimeSessionId), {
+        recursive: true,
+        force: true,
+    });
+    const managedRoot = process.env.BOTLEARN_AGENT_SERVICE_WORKSPACE_ROOT?.trim();
+    if (managedRoot) {
+        rmSync(path.join(managedRoot, runtimeSessionId), { recursive: true, force: true });
     }
+}
+export function ensureRuntimeSessionWorkspace(runtimeSessionId, sandboxGeneration, agentRunId) {
+    const { rootDir, workspaceDir } = ensureRuntimeSessionDirectories(runtimeSessionId, sandboxGeneration);
+    const transcriptFile = runtimeSessionTranscriptPath(runtimeSessionId, sandboxGeneration, agentRunId);
     mkdirTolerant(path.dirname(transcriptFile));
     return { rootDir, workspaceDir, transcriptFile };
 }

package/package.json

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

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

@@ -1,67 +0,0 @@
-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 AgentServiceSessionOptions {
-    wsUrl: string;
-    sessionId: string;
-    sessionToken: string;
-    runtimes: Map<string, CourseRuntime>;
-    daemonVersion: string;
-    runtimeEnv?: Record<string, string>;
-    log?: Logger;
-    random?: () => number;
-    sleep?: (ms: number) => Promise<void>;
-}
-/** Long-running daemon client for one persistent managed sandbox session. */
-export declare class AgentServiceSessionClient implements RunReportingClient, PersistentSessionExecution {
-    private readonly options;
-    private readonly log;
-    private readonly random;
-    private readonly sleep;
-    private readonly state;
-    private readonly dispatcher;
-    private readonly attempts;
-    private readonly runtimeProfiles;
-    private readonly pendingAcks;
-    private readonly pendingFilePrepares;
-    private readonly pendingFileCommits;
-    private readonly fileGrants;
-    private readonly inflightCommands;
-    private socket;
-    private sessionGeneration;
-    private connectionEpoch;
-    private inboundSeq;
-    private heartbeatMs;
-    private staleMs;
-    private stopped;
-    private permanentFailure;
-    constructor(options: AgentServiceSessionOptions);
-    prepareTurn(payload: RunStartPayload): PreparedPersistentTurn;
-    persistNativeSession(sessionId: string): void;
-    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;
-    private applyDesiredState;
-    private reconcileInterruptedCommand;
-    private runtimeActivation;
-    private ackEventOrFile;
-    private acceptFileGrant;
-    private replaySpool;
-    private sendHeartbeat;
-    private sendCommandAck;
-    private sendControlFrame;
-    private sendFrame;
-    private nextOutboundSeq;
-    private spoolBytes;
-    private enforceSpoolLimit;
-    private rejectPending;
-    private rejectPendingFiles;
-    private persist;
-}