@ricsam/r5dctl 0.0.36 → 0.0.37

package/dist/cjs/cli.cjs

@@ -49,6 +49,8 @@ __export(cli_exports, {
   renderProcessHistory: () => renderProcessHistory,
   renderProcessInspection: () => renderProcessInspection,
   renderProcessList: () => renderProcessList,
+  renderWorkspaceStatus: () => renderWorkspaceStatus,
+  renderWorkspaceSync: () => renderWorkspaceSync,
   resolveCommandExecution: () => resolveCommandExecution,
   runR5dctlCli: () => runR5dctlCli,
   summarizeEnvData: () => summarizeEnvData
@@ -132,6 +134,17 @@ const SHARED_HELP_ENTRIES = [
   },
   { section: "auth", usage: "auth api-key list", description: "List API keys for the current account." },
   { section: "auth", usage: "auth api-key revoke <key-id>", description: "Revoke an API key." },
+  { section: "workspace", usage: "workspace status", description: "Inspect the per-user canonical workspace and active remediation." },
+  {
+    section: "workspace",
+    usage: "workspace sync [--worker <label>]",
+    description: "Publish a connected worker into the canonical workspace now."
+  },
+  {
+    section: "workspace",
+    usage: "workspace reset [--worker <label>] --confirm",
+    description: "Destructively discard a blocked remediation candidate and restore canonical state."
+  },
   { section: "projects", usage: "get projects", description: "List projects you can access." },
   { section: "projects", usage: "describe project <namespace/name|id>", description: "Show details for a project." },
   { section: "projects", usage: "update project <namespace/name|id> --mode <greenfield|prod>", description: "Update project settings." },
@@ -158,6 +171,11 @@ const SHARED_HELP_ENTRIES = [
     usage: "-p <project> get sessions [--branch <branch>]",
     description: "List sessions for a project, optionally filtered by branch."
   },
+  {
+    section: "sessions",
+    usage: "sessions recent [--limit <n>]",
+    description: "List the most recently active sessions across your projects."
+  },
   {
     section: "sessions",
     usage: "-p <project> create session -b <branch> [--name <name>]",
@@ -229,6 +247,7 @@ const SHARED_HELP_ENTRIES = [
 ];
 const HELP_SECTION_ORDER = [
   "auth",
+  "workspace",
   "projects",
   "branches",
   "envs",
@@ -240,6 +259,7 @@ const HELP_SECTION_ORDER = [
 ];
 const HELP_SECTION_TITLES = {
   auth: "Auth",
+  workspace: "Canonical workspace",
   projects: "Projects",
   branches: "Branches",
   envs: "Environment variables",
@@ -850,6 +870,35 @@ function parsePsHistoryArgs(args) {
   }
   return { ...parsePsListArgs(filterArgs), ...limit !== void 0 ? { limit } : {} };
 }
+function parseWorkspaceWorkerArgs(args, options = {}) {
+  let worker;
+  let confirmed = false;
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
+    if (arg === "--worker" || arg?.startsWith("--worker=")) {
+      if (worker) throw new Error("Use only one --worker value");
+      worker = requireValue(arg === "--worker" ? args[++index] : parseLongOptionWithEquals(arg, "--worker"), "Missing value for --worker");
+      continue;
+    }
+    if (arg === "--confirm" && options.allowConfirm) {
+      confirmed = true;
+      continue;
+    }
+    throw new Error(`Unknown workspace argument: ${arg ?? ""}`.trim());
+  }
+  if (options.allowConfirm && !confirmed) throw new Error("workspace reset requires --confirm");
+  return { ...worker ? { worker } : {}, ...confirmed ? { confirmed: true } : {} };
+}
+function parseRecentSessionArgs(args) {
+  if (args.length === 0) return {};
+  if (args.length > 2 || args[0] !== "--limit" && !args[0]?.startsWith("--limit=")) {
+    throw new Error(`Unknown sessions recent argument: ${args[0] ?? ""}`.trim());
+  }
+  const raw = args[0] === "--limit" ? args[1] : parseLongOptionWithEquals(args[0], "--limit");
+  const limit = Number(requireValue(raw, "Missing value for --limit"));
+  if (!Number.isInteger(limit) || limit < 1 || limit > 200) throw new Error("--limit must be an integer between 1 and 200");
+  return { limit };
+}
 async function openInBrowser(url) {
   if (process.platform === "darwin") {
     (0, import_node_child_process.spawn)("open", [url], { stdio: "ignore", detached: true }).unref();
@@ -988,6 +1037,29 @@ function renderSessionList(sessions) {
   return `${sessions.map((session) => `${session.id}  ${session.branchName}  ${session.name ?? "(unnamed)"}`).join("\n")}
 `;
 }
+function renderRecentSessionList(sessions) {
+  if (sessions.length === 0) return "No recent sessions.\n";
+  return `${sessions.map((session) => `${session.id}  ${session.projectPath}/${session.branchName}  ${session.name ?? "(unnamed)"}`).join("\n")}
+`;
+}
+function renderWorkspaceStatus(status) {
+  const lines = [
+    `Workspace HEAD: ${status.head ?? "(not initialized)"}`,
+    `Latest sync: ${status.latestSync ? `${status.latestSync.outcome} on ${status.latestSync.workerLabel}` : "(none)"}`,
+    `Remediation: ${status.incident ? `${status.incident.status} (${status.incident.id}) on ${status.incident.originWorkerLabel}` : "none"}`
+  ];
+  return `${lines.join("\n")}
+`;
+}
+function renderWorkspaceSync(result) {
+  const head = result.publishedHead ?? result.candidateHead ?? result.startingHead ?? "(none)";
+  const discarded = result.discardedPaths.length > 0 ? `
+Discarded paths: ${result.discardedPaths.join(", ")}` : "";
+  const error = result.error ? `
+Error: ${result.error}` : "";
+  return `Workspace sync ${result.outcome} on ${result.workerLabel}; HEAD ${head}; ${result.diffSizeBytes} bytes.${discarded}${error}
+`;
+}
 function renderSessionDescription(session) {
   return [`Session: ${session.id}`, `Project: ${session.projectPath}`, `Branch: ${session.branchName}`].join("\n") + "\n";
 }
@@ -1055,6 +1127,9 @@ function renderProcessInspection(process2) {
     `Completed: ${process2.completedAt ?? "(running)"}`,
     `Exit code: ${process2.exitCode ?? "(none)"}`,
     `Error: ${process2.error ?? "(none)"}`,
+    `Workspace sync: ${process2.workspaceSync ? `${process2.workspaceSync.outcome} (${process2.workspaceSync.attemptId})` : "(pending or not observed)"}`,
+    ...process2.workspaceSync?.affectedProjects.length ? [`Repositories observed during synchronization: ${process2.workspaceSync.affectedProjects.join(", ")}`] : [],
+    ...process2.workspaceSync?.discardedPaths.length ? [`Discarded paths: ${process2.workspaceSync.discardedPaths.join(", ")}`] : [],
     `Log: ${process2.logPath}`,
     "",
     `stdout tail${process2.stdoutTailTruncated ? " (truncated)" : ""}:`,
@@ -1334,6 +1409,23 @@ async function executeR5dctlCommand(client, json, args) {
     write(result, "API key revoked.\n");
     return;
   }
+  if (first === "workspace" && second === "status") {
+    if (args.length > 2) throw new Error(`Unexpected workspace status argument: ${args[2]}`);
+    const status = await client.workspace.status();
+    write(status, renderWorkspaceStatus(status));
+    return;
+  }
+  if (first === "workspace" && second === "sync") {
+    const result = await client.workspace.sync(parseWorkspaceWorkerArgs(args.slice(2)));
+    write(result, renderWorkspaceSync(result));
+    return;
+  }
+  if (first === "workspace" && second === "reset") {
+    const parsed = parseWorkspaceWorkerArgs(args.slice(2), { allowConfirm: true });
+    const result = await client.workspace.reset({ worker: parsed.worker, confirmed: true });
+    write(result, renderWorkspaceSync(result));
+    return;
+  }
   if (first === "ps" && second === "list") {
     const processes = await client.processes.list(parsePsListArgs(args.slice(2)));
     write(processes, renderProcessList(processes));
@@ -1356,6 +1448,11 @@ async function executeR5dctlCommand(client, json, args) {
 `);
     return;
   }
+  if (first === "sessions" && second === "recent") {
+    const sessions = await client.sessions.recent(parseRecentSessionArgs(args.slice(2)));
+    write(sessions, renderRecentSessionList(sessions));
+    return;
+  }
   if (first === "projects" && second === "list" || first === "get" && second === "projects") {
     const projects = await client.projects.list();
     write(projects, renderProjectList(projects));
@@ -1593,7 +1690,7 @@ function resolveCommandExecution(options, rest) {
       pluginArgs: [...normalizedRest, "--help"]
     };
   }
-  if (command === "projects" || command === "sessions") {
+  if (command === "projects" || command === "sessions" || command === "workspace") {
     return {
       kind: "plugin",
       pluginArgs: normalizedRest
@@ -2135,6 +2232,8 @@ async function main(argv = process.argv.slice(2)) {
   renderProcessHistory,
   renderProcessInspection,
   renderProcessList,
+  renderWorkspaceStatus,
+  renderWorkspaceSync,
   resolveCommandExecution,
   runR5dctlCli,
   summarizeEnvData

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "type": "commonjs"
 }

package/dist/mjs/cli.mjs

@@ -79,6 +79,17 @@ const SHARED_HELP_ENTRIES = [
   },
   { section: "auth", usage: "auth api-key list", description: "List API keys for the current account." },
   { section: "auth", usage: "auth api-key revoke <key-id>", description: "Revoke an API key." },
+  { section: "workspace", usage: "workspace status", description: "Inspect the per-user canonical workspace and active remediation." },
+  {
+    section: "workspace",
+    usage: "workspace sync [--worker <label>]",
+    description: "Publish a connected worker into the canonical workspace now."
+  },
+  {
+    section: "workspace",
+    usage: "workspace reset [--worker <label>] --confirm",
+    description: "Destructively discard a blocked remediation candidate and restore canonical state."
+  },
   { section: "projects", usage: "get projects", description: "List projects you can access." },
   { section: "projects", usage: "describe project <namespace/name|id>", description: "Show details for a project." },
   { section: "projects", usage: "update project <namespace/name|id> --mode <greenfield|prod>", description: "Update project settings." },
@@ -105,6 +116,11 @@ const SHARED_HELP_ENTRIES = [
     usage: "-p <project> get sessions [--branch <branch>]",
     description: "List sessions for a project, optionally filtered by branch."
   },
+  {
+    section: "sessions",
+    usage: "sessions recent [--limit <n>]",
+    description: "List the most recently active sessions across your projects."
+  },
   {
     section: "sessions",
     usage: "-p <project> create session -b <branch> [--name <name>]",
@@ -176,6 +192,7 @@ const SHARED_HELP_ENTRIES = [
 ];
 const HELP_SECTION_ORDER = [
   "auth",
+  "workspace",
   "projects",
   "branches",
   "envs",
@@ -187,6 +204,7 @@ const HELP_SECTION_ORDER = [
 ];
 const HELP_SECTION_TITLES = {
   auth: "Auth",
+  workspace: "Canonical workspace",
   projects: "Projects",
   branches: "Branches",
   envs: "Environment variables",
@@ -797,6 +815,35 @@ function parsePsHistoryArgs(args) {
   }
   return { ...parsePsListArgs(filterArgs), ...limit !== void 0 ? { limit } : {} };
 }
+function parseWorkspaceWorkerArgs(args, options = {}) {
+  let worker;
+  let confirmed = false;
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
+    if (arg === "--worker" || arg?.startsWith("--worker=")) {
+      if (worker) throw new Error("Use only one --worker value");
+      worker = requireValue(arg === "--worker" ? args[++index] : parseLongOptionWithEquals(arg, "--worker"), "Missing value for --worker");
+      continue;
+    }
+    if (arg === "--confirm" && options.allowConfirm) {
+      confirmed = true;
+      continue;
+    }
+    throw new Error(`Unknown workspace argument: ${arg ?? ""}`.trim());
+  }
+  if (options.allowConfirm && !confirmed) throw new Error("workspace reset requires --confirm");
+  return { ...worker ? { worker } : {}, ...confirmed ? { confirmed: true } : {} };
+}
+function parseRecentSessionArgs(args) {
+  if (args.length === 0) return {};
+  if (args.length > 2 || args[0] !== "--limit" && !args[0]?.startsWith("--limit=")) {
+    throw new Error(`Unknown sessions recent argument: ${args[0] ?? ""}`.trim());
+  }
+  const raw = args[0] === "--limit" ? args[1] : parseLongOptionWithEquals(args[0], "--limit");
+  const limit = Number(requireValue(raw, "Missing value for --limit"));
+  if (!Number.isInteger(limit) || limit < 1 || limit > 200) throw new Error("--limit must be an integer between 1 and 200");
+  return { limit };
+}
 async function openInBrowser(url) {
   if (process.platform === "darwin") {
     spawn("open", [url], { stdio: "ignore", detached: true }).unref();
@@ -935,6 +982,29 @@ function renderSessionList(sessions) {
   return `${sessions.map((session) => `${session.id}  ${session.branchName}  ${session.name ?? "(unnamed)"}`).join("\n")}
 `;
 }
+function renderRecentSessionList(sessions) {
+  if (sessions.length === 0) return "No recent sessions.\n";
+  return `${sessions.map((session) => `${session.id}  ${session.projectPath}/${session.branchName}  ${session.name ?? "(unnamed)"}`).join("\n")}
+`;
+}
+function renderWorkspaceStatus(status) {
+  const lines = [
+    `Workspace HEAD: ${status.head ?? "(not initialized)"}`,
+    `Latest sync: ${status.latestSync ? `${status.latestSync.outcome} on ${status.latestSync.workerLabel}` : "(none)"}`,
+    `Remediation: ${status.incident ? `${status.incident.status} (${status.incident.id}) on ${status.incident.originWorkerLabel}` : "none"}`
+  ];
+  return `${lines.join("\n")}
+`;
+}
+function renderWorkspaceSync(result) {
+  const head = result.publishedHead ?? result.candidateHead ?? result.startingHead ?? "(none)";
+  const discarded = result.discardedPaths.length > 0 ? `
+Discarded paths: ${result.discardedPaths.join(", ")}` : "";
+  const error = result.error ? `
+Error: ${result.error}` : "";
+  return `Workspace sync ${result.outcome} on ${result.workerLabel}; HEAD ${head}; ${result.diffSizeBytes} bytes.${discarded}${error}
+`;
+}
 function renderSessionDescription(session) {
   return [`Session: ${session.id}`, `Project: ${session.projectPath}`, `Branch: ${session.branchName}`].join("\n") + "\n";
 }
@@ -1002,6 +1072,9 @@ function renderProcessInspection(process2) {
     `Completed: ${process2.completedAt ?? "(running)"}`,
     `Exit code: ${process2.exitCode ?? "(none)"}`,
     `Error: ${process2.error ?? "(none)"}`,
+    `Workspace sync: ${process2.workspaceSync ? `${process2.workspaceSync.outcome} (${process2.workspaceSync.attemptId})` : "(pending or not observed)"}`,
+    ...process2.workspaceSync?.affectedProjects.length ? [`Repositories observed during synchronization: ${process2.workspaceSync.affectedProjects.join(", ")}`] : [],
+    ...process2.workspaceSync?.discardedPaths.length ? [`Discarded paths: ${process2.workspaceSync.discardedPaths.join(", ")}`] : [],
     `Log: ${process2.logPath}`,
     "",
     `stdout tail${process2.stdoutTailTruncated ? " (truncated)" : ""}:`,
@@ -1281,6 +1354,23 @@ async function executeR5dctlCommand(client, json, args) {
     write(result, "API key revoked.\n");
     return;
   }
+  if (first === "workspace" && second === "status") {
+    if (args.length > 2) throw new Error(`Unexpected workspace status argument: ${args[2]}`);
+    const status = await client.workspace.status();
+    write(status, renderWorkspaceStatus(status));
+    return;
+  }
+  if (first === "workspace" && second === "sync") {
+    const result = await client.workspace.sync(parseWorkspaceWorkerArgs(args.slice(2)));
+    write(result, renderWorkspaceSync(result));
+    return;
+  }
+  if (first === "workspace" && second === "reset") {
+    const parsed = parseWorkspaceWorkerArgs(args.slice(2), { allowConfirm: true });
+    const result = await client.workspace.reset({ worker: parsed.worker, confirmed: true });
+    write(result, renderWorkspaceSync(result));
+    return;
+  }
   if (first === "ps" && second === "list") {
     const processes = await client.processes.list(parsePsListArgs(args.slice(2)));
     write(processes, renderProcessList(processes));
@@ -1303,6 +1393,11 @@ async function executeR5dctlCommand(client, json, args) {
 `);
     return;
   }
+  if (first === "sessions" && second === "recent") {
+    const sessions = await client.sessions.recent(parseRecentSessionArgs(args.slice(2)));
+    write(sessions, renderRecentSessionList(sessions));
+    return;
+  }
   if (first === "projects" && second === "list" || first === "get" && second === "projects") {
     const projects = await client.projects.list();
     write(projects, renderProjectList(projects));
@@ -1540,7 +1635,7 @@ function resolveCommandExecution(options, rest) {
       pluginArgs: [...normalizedRest, "--help"]
     };
   }
-  if (command === "projects" || command === "sessions") {
+  if (command === "projects" || command === "sessions" || command === "workspace") {
     return {
       kind: "plugin",
       pluginArgs: normalizedRest
@@ -2081,6 +2176,8 @@ export {
   renderProcessHistory,
   renderProcessInspection,
   renderProcessList,
+  renderWorkspaceStatus,
+  renderWorkspaceSync,
   resolveCommandExecution,
   runR5dctlCli,
   summarizeEnvData

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "type": "module"
 }

package/dist/types/cli.d.ts

@@ -1,4 +1,4 @@
-import { type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessRun, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
+import { type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessRun, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
 export type GlobalOptions = {
     baseUrl?: string;
     json: boolean;
@@ -62,6 +62,8 @@ export declare function parseShellArgs(args: string[]): {
 };
 export declare function parsePsListArgs(args: string[]): R5dctlProcessListInput;
 export declare function parsePsHistoryArgs(args: string[]): R5dctlProcessListInput;
+export declare function renderWorkspaceStatus(status: R5dctlWorkspaceStatus): string;
+export declare function renderWorkspaceSync(result: R5dctlWorkspaceSyncResult): string;
 export declare function formatProcessAge(startedAt: string, nowMs?: number): string;
 export declare function renderProcessList(processes: R5dctlProcessRun[], nowMs?: number): string;
 export declare function renderProcessHistory(processes: R5dctlProcessRun[], nowMs?: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -26,7 +26,7 @@
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.36",
+    "@ricsam/r5d-api": "^0.0.37",
     "dotenv": "^17",
     "ws": "^8.18.3"
   },