@ricsam/r5d-worker 0.0.176 → 0.0.177

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.176",
+  "version": "0.0.177",
   "type": "commonjs"
 }

package/dist/mjs/internal-r5dctl.cjs

@@ -20605,7 +20605,7 @@ function resolveEntrypointPath(entrypoint) {
   }
 }
 function getR5dctlVersion() {
-  if (true) return "0.0.176";
+  if (true) return "0.0.177";
   const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
   let current = entrypoint ? import_node_path2.default.dirname(entrypoint) : process.cwd();
   for (let index = 0; index < 12; index += 1) {

package/dist/mjs/main.mjs

@@ -7,15 +7,15 @@ import { startManagerRpc } from "./runtime/releases/rpc-main.mjs";
 import { ManagerRpcConfig } from "./runtime/releases/rpc-protocol.mjs";
 const args = process.argv.slice(2);
 if (args.includes("--version")) {
-  console.log(`r5d-worker ${true ? "0.0.176" : "development"}`);
+  console.log(`r5d-worker ${true ? "0.0.177" : "development"}`);
 } else if (!args.length || args.includes("--help")) {
   console.log(
-    "Usage: r5d-worker start --label <label> [--root <dir>] [--base-url <url>] [--token <worker-token>]\n       r5d-worker executor /absolute/private/config.json\n       r5d-worker manager /absolute/private/config.json\n\nRun independently supervised durable runtime services. Provision configuration with r5dinfra."
+    "Usage: r5d-worker start --label <label> [--root <dir>] [--base-url <url>] [--token <worker-token>] [--initial-sync merge|reset]\n       r5d-worker executor /absolute/private/config.json\n       r5d-worker manager /absolute/private/config.json\n\nRun independently supervised durable runtime services. Provision configuration with r5dinfra."
   );
 } else if (args[0] === "start") {
   const runtime = await startPersonalWorker(
     parsePersonalWorkerOptions(args.slice(1)),
-    true ? "0.0.176" : "development"
+    true ? "0.0.177" : "development"
   );
   console.log(`Worker connected: ${runtime.resourceId}`);
   let closing = false;

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.176",
+  "version": "0.0.177",
   "type": "module"
 }

package/dist/mjs/personal/client.mjs

@@ -27,7 +27,7 @@ class PersonalResponseError extends Error {
 const storageErrorCodes = /* @__PURE__ */ new Set(["invalid_input", "conflict", "not_found", "busy", "stale_fence", "unknown", "unsafe_path", "git_failed"]);
 function parsePersonalWorkerOptions(args, environment = process.env) {
   const values = {};
-  const allowed = /* @__PURE__ */ new Set(["label", "base-url", "token", "api-key", "config", "root"]);
+  const allowed = /* @__PURE__ */ new Set(["label", "base-url", "token", "api-key", "config", "root", "initial-sync"]);
   for (let index = 0; index < args.length; index++) {
     const arg = args[index];
     const match = /^--([^=]+)(?:=(.*))?$/.exec(arg);
@@ -54,17 +54,21 @@ function parsePersonalWorkerOptions(args, environment = process.env) {
     throw new Error("Worker base URL must use HTTPS or local loopback");
   const credential = values.token ?? values["api-key"] ?? environment.R5D_TOKEN ?? environment.R5D_API_KEY ?? string(saved.token) ?? string(saved.apiKey);
   if (!credential) throw new Error(`Authenticate this worker with: r5dctl auth login --worker-label ${label}`);
+  const initialSync = values["initial-sync"] ?? "merge";
+  if (initialSync !== "merge" && initialSync !== "reset") throw new Error("--initial-sync must be merge or reset");
   return {
     label,
     baseUrl: origin.origin,
     credential,
-    root: path.resolve(values.root ?? environment.R5D_ROOT ?? path.join(os.homedir(), ".r5d"))
+    root: path.resolve(values.root ?? environment.R5D_ROOT ?? path.join(os.homedir(), ".r5d")),
+    initialSync
   };
 }
 function safeError(error) {
   const value = error.code;
   return typeof value === "string" && /^[a-zA-Z0-9_-]{1,100}$/.test(value) ? value : "personal_operation_unknown";
 }
+const resetBatchId = (instanceId) => `${instanceId.slice(0, 16)}-${Date.now().toString(36)}`;
 const rejectedBeforeAdmission = (error) => error?.rejectedBeforeAdmission === true;
 const CliUpdateRequest = z.object({ kind: z.literal("update-clis"), userId: z.string(), command: z.object({ version: z.string() }).passthrough() }).passthrough();
 async function startPersonalWorker(options, version) {
@@ -139,6 +143,14 @@ async function startPersonalWorker(options, version) {
       return result && typeof result === "object" && typeof result.incidentId === "string" ? { incidentId: result.incidentId } : void 0;
     }
   });
+  if (options.initialSync === "reset") {
+    const results = await runtime.resetProjectCheckouts(`initial-sync-${resetBatchId(identity.instanceId)}`);
+    const reset = results.filter((entry) => !entry.error), refused = results.filter((entry) => entry.error);
+    process.stderr.write(`[r5d-worker] initial sync reset: ${reset.length} checkout(s) restored to the server state${reset.length ? ` (${reset.map((entry) => entry.workbenchId).join(", ")}); discarded changes retained beside each checkout's state` : ""}
+`);
+    for (const entry of refused) process.stderr.write(`[r5d-worker] initial sync reset skipped ${entry.workbenchId}: ${entry.error}
+`);
+  }
   const ledgerFile = path.join(root, "relay.sqlite");
   try {
     closeSync(openSync(ledgerFile, "wx", 384));

package/dist/mjs/personal/runtime.mjs

@@ -226,8 +226,8 @@ exec ${quote(executable)} ${quote(cli)} "$@"
         return binding;
       };
       if (previous && canonicalJson(stable(previous)) !== canonicalJson(stable(row))) throw new Error("Personal workbench identity changed");
-      if (!previous) {
-        manifests.set(input.id, row);
+      if (!previous || previous.sessionId !== row.sessionId) {
+        manifests.set(input.id, previous ? { ...previous, sessionId: row.sessionId, ...row.sharedSessionId ? { sharedSessionId: row.sharedSessionId } : {}, ...row.baseCommitHash ? { baseCommitHash: row.baseCommitHash } : {} } : row);
         const tmp = `${manifestFile}.${randomBytes(8).toString("hex")}.next`;
         const handle = await fs.open(tmp, "wx", 384);
         try {
@@ -481,6 +481,22 @@ exec ${quote(executable)} ${quote(cli)} "$@"
       const identity = { userId: grant.userId, sessionId: RuntimeId.parse(input.sessionId) };
       return authority.streamInput(identity, { ...identity, operationId: RuntimeId.parse(input.operationId), fence: current.workerFence }, input.data, input.resize);
     }
+    async function resetProjectCheckouts(idPrefix) {
+      const results = [];
+      for (const [workbenchId, sessionId] of publicationSessions) {
+        const manifest = manifests.get(workbenchId);
+        if (!manifest || manifest.rootProfile !== "project") continue;
+        const identity = { userId: grant.userId, sessionId };
+        try {
+          if (!(await authority.status(identity)).initialized) continue;
+          const result = await authority.reset(identity, { id: `${idPrefix}-${workbenchId}` });
+          results.push({ workbenchId, head: result.head ?? null });
+        } catch (error) {
+          results.push({ workbenchId, head: null, error: error instanceof WorkspaceError ? error.code : error instanceof Error && "code" in error && typeof error.code === "string" ? error.code : "reset_failed" });
+        }
+      }
+      return results;
+    }
     return {
       grant,
       renew,
@@ -489,6 +505,7 @@ exec ${quote(executable)} ${quote(cli)} "$@"
       synchronize,
       subscribeTerminal,
       terminalInput,
+      resetProjectCheckouts,
       async close() {
         closing = true;
         clearInterval(publicationTimer);

package/dist/mjs/runtime/workspace/authority.mjs

@@ -1210,7 +1210,7 @@ class WorkspaceAuthority {
   /** An explicit user reset retains the complete old tree/index before hydration. */
   async reset(identity, input) {
     const b = await this.bench(identity);
-    return this.serial(b, () => this.productAction(b, input.id, { method: "reset", expectedHead: input.expectedHead }, async () => {
+    return this.serial(b, () => this.productAction(b, input.id, { method: "reset", expectedHead: input.expectedHead ?? null }, async () => {
       await this.assertAvailable(b, true);
       if (input.expectedHead !== void 0 && input.expectedHead !== b.state.head) throw new WorkspaceError("conflict", "Workbench base changed before reset");
       if (b.state.blocked?.code === "archived") throw new WorkspaceError("archived", "A deleted branch cannot be reset");

package/dist/types/personal/client.d.ts

@@ -1,9 +1,16 @@
+/** What the first synchronization after `r5d-worker start` does to checkouts
+ * that diverged from the server while the worker was away: `merge` integrates
+ * them and opens a conflict remediation when needed (the default); `reset`
+ * takes the server state and keeps the discarded local changes aside under
+ * the checkout's retained directory. */
+export type PersonalWorkerInitialSync = "merge" | "reset";
 export type PersonalWorkerOptions = {
     label: string;
     baseUrl: string;
     credential: string;
     root: string;
     cliEntrypoint?: string;
+    initialSync?: PersonalWorkerInitialSync;
 };
 export declare function parsePersonalWorkerOptions(args: string[], environment?: Record<string, string | undefined>): PersonalWorkerOptions;
 /** HTTP reconnects never replace the local source/PTY keeper. */

package/dist/types/personal/runtime.d.ts

@@ -179,6 +179,11 @@ export declare function openPersonalWorkerRuntime(options: {
             rows: number;
         };
     }) => Promise<import("../runtime/protocol").InputResult>;
+    resetProjectCheckouts: (idPrefix: string) => Promise<{
+        workbenchId: string;
+        head: string | null;
+        error?: string;
+    }[]>;
     close(): Promise<void>;
 }>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.176",
+  "version": "0.0.177",
   "type": "module",
   "main": "./dist/mjs/main.mjs",
   "module": "./dist/mjs/main.mjs",
@@ -21,7 +21,7 @@
     "r5d-worker": "dist/mjs/main.mjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.176",
+    "@ricsam/r5d-api": "^0.0.177",
     "node-pty": "1.1.0",
     "zod": "^4.1.13",
     "picomatch": "^4.0.3"