@botlearn-course/daemon 0.0.20-beta.13 → 0.0.20-beta.14

package/README.md

@@ -48,10 +48,10 @@ daemon，由 root-owned 固定 launcher 清空附加组后直接降权为 `user`
 课程任务或 workspace shell。
 
 veFaaS Origin 的托管 workspace 使用用户级 NAS backing image。root bootstrap 完成 NFS、marker、
-ext4、loop mount 和固定 3 GiB 校验后，daemon 才发送 `sandbox.ready`。RuntimeSession 使用稳定路径
+ext4、`fuse2fs` mount 和固定 3 GiB 校验后，daemon 才发送 `sandbox.ready`。RuntimeSession 使用稳定路径
 `/workspace/sessions/{runtime_session_id}/workspace`，Sandbox generation 只参与写入隔离。磁盘写满
 统一上报 `workspace_user_quota_exceeded`。pause 和 cleanup 进入 drain 后，daemon 先停止 runtime
-writer，再通过 root launcher 执行 ext4 sync、loop unmount、backing image 和 NFS parent fsync；完成后
+writer，再通过 root launcher 执行 ext4 sync、`fuse2fs` unmount、backing image 和 NFS parent fsync；完成后
 才发送 `sandbox.drained` 并退出。
 
 ## 支持的 runtime

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

@@ -3,6 +3,8 @@ import type { WorkspaceScanMeasurement } from "./file-candidates.js";
 import { type RuntimeSkillProviderFactory } from "./runtime-skills.js";
 import { type PersistentSessionExecution, type PreparedPersistentTurn, type RunReportingClient } from "./run-dispatcher.js";
 import type { CourseRuntime, CourseRuntimeProfile, RunEvent, RunEventReceipt, RunFileCandidate, RunFileRecord, RunStartPayload } from "./types.js";
+export declare function workspaceDurabilityCapabilities(usesNasWorkspace?: boolean): string[];
+export declare function assertWorkspaceRestoreAllowed(requestedRestore: unknown, usesNasWorkspace?: boolean): void;
 export interface AgentServiceSandboxOptions {
     wsUrl: string;
     sandboxId: string;

package/dist/agent-service-sandbox.js

@@ -4,7 +4,7 @@ import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import path from "node:path";
 import { ensureDaemonHome } from "./auth-store.js";
-import { AGENT_SERVICE_WS_SCHEMA, AGENT_SERVICE_WS_SUBPROTOCOL, createSandboxFrame, createWorkspaceFileChunk, parseSandboxFrame, UnsupportedSandboxProtocolError, WORKSPACE_FILE_READ_BINARY_CAPABILITY, WORKSPACE_SNAPSHOT_ATTESTATION_CAPABILITY, } from "./agent-service-ws-protocol.js";
+import { AGENT_SERVICE_WS_SCHEMA, AGENT_SERVICE_WS_SUBPROTOCOL, createSandboxFrame, createWorkspaceFileChunk, parseSandboxFrame, UnsupportedSandboxProtocolError, WORKSPACE_FILE_READ_BINARY_CAPABILITY, } from "./agent-service-ws-protocol.js";
 import { log as defaultLog, setOperationalLogSink, } from "./log.js";
 import { availableRunCapabilities, runtimeSupportsCourseSkills, } from "./runtime-capabilities.js";
 import { activationRuntimeEnv, runtimeChildEnv } from "./runtime-env.js";
@@ -41,6 +41,18 @@ function agentServiceHttpBase(wsUrl) {
 }
 const RUNTIME_LOG_WINDOW_MS = 60_000;
 const WORKSPACE_FILE_TRANSFER_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+export function workspaceDurabilityCapabilities(usesNasWorkspace = nasWorkspaceEnabled()) {
+    return [
+        "workspace_writer_freeze_v1",
+        "workspace_snapshot_v2",
+        ...(usesNasWorkspace ? ["workspace_nas_v1"] : ["workspace_restore_v1"]),
+    ];
+}
+export function assertWorkspaceRestoreAllowed(requestedRestore, usesNasWorkspace = nasWorkspaceEnabled()) {
+    if (usesNasWorkspace && requestedRestore !== null && requestedRestore !== undefined) {
+        throw new Error("workspace_restore_forbidden_for_nas");
+    }
+}
 const DISABLED_RUNTIME_LOG_POLICY = {
     enabled: false,
     maxEventBytes: 4096,
@@ -872,11 +884,7 @@ export class AgentServiceSandboxClient {
             protocol_versions: [AGENT_SERVICE_WS_SCHEMA],
             capabilities: [
                 WORKSPACE_FILE_READ_BINARY_CAPABILITY,
-                "workspace_writer_freeze_v1",
-                "workspace_snapshot_v2",
-                "workspace_restore_v1",
-                WORKSPACE_SNAPSHOT_ATTESTATION_CAPABILITY,
-                ...(nasWorkspaceEnabled() ? ["workspace_nas_v1"] : []),
+                ...workspaceDurabilityCapabilities(),
                 ...(workspaceCopyV1Supported() ? ["workspace_copy_v1"] : []),
             ],
             workspace_snapshot_policy: workspaceSnapshotPolicyCapability(),
@@ -1060,6 +1068,7 @@ export class AgentServiceSandboxClient {
         const requestedWorkspaceRef = frame.payload.workspace_ref;
         const requestedCopy = frame.payload.workspace_copy;
         const requestedRestore = frame.payload.workspace_restore;
+        assertWorkspaceRestoreAllowed(requestedRestore);
         const requestedCopyRecord = requestedCopy && typeof requestedCopy === "object"
             ? requestedCopy
             : undefined;
@@ -1345,10 +1354,14 @@ export class AgentServiceSandboxClient {
         }
         this.state.sessions[sessionId] = session;
         this.persist();
-        const materialization = readWorkspaceMaterializationMarker(this.options.sandboxId, sessionId);
+        const usesNasWorkspace = nasWorkspaceEnabled();
+        const materialization = usesNasWorkspace
+            ? null
+            : readWorkspaceMaterializationMarker(this.options.sandboxId, sessionId);
         await this.sendSessionFrame("session.opened", sessionId, {
             workspace_ref: session.workspaceRef,
             native_session_id: session.nativeSessionId,
+            workspace_authority: usesNasWorkspace ? "nas" : "snapshot",
             ...(materialization
                 ? {
                     workspace_marker_version: 1,

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

@@ -1,7 +1,6 @@
 export declare const AGENT_SERVICE_WS_SCHEMA: "botlearn-agent-sandbox-ws/0.4";
 export declare const AGENT_SERVICE_WS_SUBPROTOCOL: "botlearn-agent-sandbox.v4";
 export declare const WORKSPACE_FILE_READ_BINARY_CAPABILITY: "workspace_file_read_binary_v1";
-export declare const WORKSPACE_SNAPSHOT_ATTESTATION_CAPABILITY: "workspace_snapshot_attestation_v1";
 export declare const WORKSPACE_FILE_CHUNK_BYTES: number;
 export declare const WORKSPACE_FILE_CHUNK_HEADER_BYTES = 29;
 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" | "workspace.file.read" | "workspace.checkpoint" | "workspace.thaw" | "ping" | "sandbox.ready" | "sandbox.heartbeat" | "command.ack" | "session.opened" | "session.open_failed" | "session.closed" | "turn.event" | "turn.file.report" | "workspace.file.result" | "sandbox.drained" | "sandbox.log" | "pong" | "protocol.error";

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

@@ -2,7 +2,6 @@ import { randomUUID } from "node:crypto";
 export const AGENT_SERVICE_WS_SCHEMA = "botlearn-agent-sandbox-ws/0.4";
 export const AGENT_SERVICE_WS_SUBPROTOCOL = "botlearn-agent-sandbox.v4";
 export const WORKSPACE_FILE_READ_BINARY_CAPABILITY = "workspace_file_read_binary_v1";
-export const WORKSPACE_SNAPSHOT_ATTESTATION_CAPABILITY = "workspace_snapshot_attestation_v1";
 export const WORKSPACE_FILE_CHUNK_BYTES = 64 * 1024;
 export const WORKSPACE_FILE_CHUNK_HEADER_BYTES = 29;
 const WORKSPACE_FILE_CHUNK_MAGIC = Buffer.from("BLWF", "ascii");

package/package.json

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