@cydm/happy-elves 0.1.0-beta.57 → 0.1.0-beta.59

package/apps/cli/dist/commands/lib/exit.js

@@ -127,6 +127,8 @@ export function handleCliError(error) {
         latestCompletedTurnId: enriched.latestCompletedTurnId,
         commandAcked: enriched.commandAcked,
         rawStatus: enriched.rawStatus,
+        lastTransientError: enriched.lastTransientError,
+        retryCount: enriched.retryCount,
     }, enriched.capability, enriched.retryable);
     process.exit(1);
 }

package/apps/cli/dist/commands/lib/orchestrator.d.ts

@@ -1,12 +1,16 @@
-import type { SessionSnapshot } from "../../../../../packages/shared/dist/index.js";
+import type { PermissionMode, SessionSnapshot } from "../../../../../packages/shared/dist/index.js";
 import type { OrchestrationSummary } from "./types.js";
 import type { TurnSummary } from "./session-output.js";
 export type OrchestratorStatus = "idle" | "inProgress" | "completed" | "needsInput" | "blocked" | "failed" | "cancelled" | "offline" | "closed";
 export type OrchestratorRequestRecord = {
     turnId: string;
     promptSha256: string;
+    inputSha256?: string;
+    sourceOutputSha256?: string;
+    runtimeTurnId?: string;
     model?: string | null;
     thoughtLevel?: string | null;
+    permissionMode?: PermissionMode;
     createdAt: number;
 };
 export type OrchestratorMetadata = {

package/apps/cli/dist/commands/lib/orchestrator.js

@@ -78,8 +78,14 @@ export function readOrchestratorMetadata(metadata) {
                 requests[requestId] = {
                     turnId: candidate.turnId,
                     promptSha256: candidate.promptSha256,
+                    ...(typeof candidate.inputSha256 === "string" ? { inputSha256: candidate.inputSha256 } : {}),
+                    ...(typeof candidate.sourceOutputSha256 === "string" ? { sourceOutputSha256: candidate.sourceOutputSha256 } : {}),
+                    ...(typeof candidate.runtimeTurnId === "string" ? { runtimeTurnId: candidate.runtimeTurnId } : {}),
                     ...(candidate.model === null || typeof candidate.model === "string" ? { model: candidate.model } : {}),
                     ...(candidate.thoughtLevel === null || typeof candidate.thoughtLevel === "string" ? { thoughtLevel: candidate.thoughtLevel } : {}),
+                    ...(candidate.permissionMode === "approve-all" || candidate.permissionMode === "approve-reads" || candidate.permissionMode === "deny-all"
+                        ? { permissionMode: candidate.permissionMode }
+                        : {}),
                     createdAt: candidate.createdAt,
                 };
             }

package/apps/cli/dist/commands/lib/session-output.js

@@ -234,7 +234,7 @@ export function summarizeTurns(events) {
         .map(({ order: _order, ...turn }) => turn);
 }
 export function structuredOutputForTurn(sessionId, turn) {
-    const finalOutput = turn.output || turn.terminalText || undefined;
+    const finalOutput = turn.status !== "running" ? turn.output || turn.terminalText || undefined : undefined;
     return {
         state: turn.status,
         sessionId,

package/apps/cli/dist/commands/lib/session-view.d.ts

@@ -1,11 +1,12 @@
 import type { ControllerClient, DecodedSessionEvent } from "../../../../../packages/client/dist/index.js";
 import type { MachineSnapshot, SessionSnapshot } from "../../../../../packages/shared/dist/index.js";
 import { type MachineMetadata, type OrchestrationSummary, type OrchestrationState } from "./types.js";
+import { type TurnSummary } from "./session-output.js";
 export declare function showMachine(client: ControllerClient, machine: MachineSnapshot): Promise<MachineSnapshot & {
     defaultCwd?: string;
     metadata: MachineMetadata;
 }>;
-export declare function deriveOrchestration(session: SessionSnapshot, events?: DecodedSessionEvent[]): OrchestrationSummary;
+export declare function deriveOrchestration(session: SessionSnapshot, events?: DecodedSessionEvent[], focusTurn?: Pick<TurnSummary, "turnId" | "status">): OrchestrationSummary;
 export declare function showSession(client: ControllerClient, session: SessionSnapshot, events?: DecodedSessionEvent[]): Promise<SessionSnapshot & {
     metadata: unknown;
     orchestration: OrchestrationSummary;

package/apps/cli/dist/commands/lib/session-view.js

@@ -38,23 +38,44 @@ function orchestrationStateFromStatus(status) {
         return "blocked";
     return "closed";
 }
-export function deriveOrchestration(session, events = []) {
-    const turns = summarizeTurns(events);
-    const latestTurn = turns[0];
-    const activeTurn = turns.find((turn) => turn.status === "running");
-    if (session.status === "failed" && latestTurn?.status === "running") {
-        return {
-            state: "active",
-            rawStatus: session.status,
-            needsUser: false,
-            blocked: false,
-            completed: false,
+function canTrustVisibleRunningTurn(status) {
+    return status !== "closed" && status !== "offline" && status !== "cancelled";
+}
+function visibleRunningTurnSummary(session, turnId) {
+    return {
+        state: "active",
+        rawStatus: session.status,
+        needsUser: false,
+        blocked: false,
+        completed: false,
+        ...(session.status !== "running" ? {
             statusConflict: {
                 rawStatus: session.status,
                 evidence: "running-turn",
-                turnId: latestTurn.turnId,
+                turnId,
             },
-        };
+        } : {}),
+    };
+}
+export function deriveOrchestration(session, events = [], focusTurn) {
+    const turns = summarizeTurns(events);
+    const latestTurn = turns[0];
+    const activeTurn = turns.find((turn) => turn.status === "running") ?? (focusTurn?.status === "running" ? focusTurn : undefined);
+    const latestTerminalTurn = turns.find((turn) => turn.status !== "running");
+    const relevantTurnId = activeTurn?.turnId ?? latestTerminalTurn?.turnId;
+    const needsUserEvent = relevantTurnId
+        ? [...events].reverse().find((event) => event.turnId === relevantTurnId && eventNeedsUser(event))
+        : undefined;
+    if (needsUserEvent && activeTurn)
+        return needsUserSummary(session, needsUserEvent);
+    if (needsUserEvent && latestTerminalTurn && latestTerminalTurn.status !== "completed") {
+        return needsUserSummary(session, needsUserEvent);
+    }
+    if (latestTurn?.status === "running" && canTrustVisibleRunningTurn(session.status)) {
+        return visibleRunningTurnSummary(session, latestTurn.turnId);
+    }
+    if (focusTurn?.status === "running" && canTrustVisibleRunningTurn(session.status)) {
+        return visibleRunningTurnSummary(session, focusTurn.turnId);
     }
     if (session.status !== "running") {
         const state = orchestrationStateFromStatus(session.status);
@@ -66,16 +87,6 @@ export function deriveOrchestration(session, events = []) {
             completed: state === "completed",
         };
     }
-    const latestTerminalTurn = turns.find((turn) => turn.status !== "running");
-    const relevantTurnId = activeTurn?.turnId ?? latestTerminalTurn?.turnId;
-    const needsUserEvent = relevantTurnId
-        ? [...events].reverse().find((event) => event.turnId === relevantTurnId && eventNeedsUser(event))
-        : undefined;
-    if (needsUserEvent && activeTurn)
-        return needsUserSummary(session, needsUserEvent);
-    if (needsUserEvent && latestTerminalTurn && latestTerminalTurn.status !== "completed") {
-        return needsUserSummary(session, needsUserEvent);
-    }
     if (activeTurn) {
         return {
             state: "active",

package/apps/cli/dist/commands/lib/usage.js

@@ -31,8 +31,10 @@ Check local controller config, relay reachability, and daemon state.
   happy-elves remote revoke <deviceId> --json
 `,
     machine: `Usage:
-  happy-elves machine list [--verbose] [--json]
-  happy-elves machine status <machineId> [--verbose] [--json]
+  happy-elves machine list [--include-archived] [--verbose] [--json]
+  happy-elves machine status <machineId> [--include-archived] [--verbose] [--json]
+  happy-elves machine archive <machineId> [--json]
+  happy-elves machine unarchive <machineId> [--json]
   happy-elves machine diagnose <machineId> [--json]
   happy-elves machine directory <machineId> [--path <path>] [--json]
   happy-elves machine exec <machineId> --shell <command> [--cwd <path>] [--timeout-ms <ms>] [--wait-timeout-ms <ms>] [--json]
@@ -58,6 +60,9 @@ Codex-like orchestration:
   returns a deterministic turnId for the supplied request id. wait-thread waits
   for that exact turn id instead of following the latest turn. handoff injects
   bounded source turn context directly into the target prompt.
+  Permission defaults to trusted-local Yolo (approve-all). Use --permission-mode
+  default/ask/accept-edits/approve-reads/deny-all/read-only only to tighten one
+  turn.
 `,
     session: `Usage:
   happy-elves session create --machine <machineId> [--agent codex] [--cwd <path>] [--name <name>] [--permission-mode <mode>] [--model <key>] [--thought-level <key>|--thinking <key>] --json
@@ -88,7 +93,7 @@ Session management:
   happy-elves turn list <sessionId> [--limit 10] [--verbose] [--json]
   happy-elves turn status <sessionId> <turnId> [--verbose] [--json]
   happy-elves turn result <sessionId> [<turnId>] [--verbose] [--json]
-  happy-elves turn run <sessionId> (--text <prompt> | --text-file <path>) [--detach] [--timeout 1000s] [--runtime-timeout 1000s] [--permission-mode approve-reads|approve-all|deny-all] [--model <key>] [--thought-level <key>|--thinking <key>] [--json]
+  happy-elves turn run <sessionId> (--text <prompt> | --text-file <path>) [--detach] [--timeout 1000s] [--runtime-timeout 1000s] [--permission-mode <mode>] [--model <key>] [--thought-level <key>|--thinking <key>] [--json]
   happy-elves turn wait <sessionId> <turnId> [--timeout 1000s] --json
   happy-elves turn cancel <sessionId> <turnId> [--reason <reason>] --json
   happy-elves turn rewind <sessionId> <turn-or-checkpoint-id> --json
@@ -96,7 +101,9 @@ Session management:
 
 Turn management:
   run starts one agent execution. It waits by default; use --detach for
-  background execution.
+  background execution. Permission defaults to trusted-local Yolo (approve-all);
+  pass --permission-mode default/ask/accept-edits/approve-reads/deny-all/read-only
+  to tighten.
   wait/result inspect a specific turn.
   rewind/fork operate on a turn or checkpoint id supplied by runtime history.
 `,
@@ -164,7 +171,7 @@ export function commandUsage(command, exitCode = 1) {
 export function usageText() {
     return `happy-elves
 
-Happy Elves is a remote controller and orchestration layer for coding agents across machines. The local agent remains the authority for runtime state. Agents should run happy-elves --skill before using this CLI.
+Happy Elves is a remote controller and orchestration layer for coding agents across machines. The local agent remains the authority for runtime state. Agents should run happy-elves skill doctor --name happy-elves-orchestrator --json before orchestrating; happy-elves --skill remains legacy guidance.
 
 Core commands:
   machine list [--json]
@@ -248,6 +255,19 @@ Recommended agent workflow:
   5. orchestrator read-turn <threadId> <turnId> --json
   6. orchestrator handoff --from <sourceThreadId> --turn <sourceTurnId> --to <targetThreadId> --text <instruction> --request-id <stable-id> --json
 
+Permission defaults:
+  Happy Elves is trusted-local by default. If orchestrator send-message omits
+  --permission-mode, the effective permission is approve-all. Pass
+  --permission-mode default/ask/accept-edits/approve-reads/deny-all/read-only
+  only when you intentionally want to tighten a turn. Inspect
+  effectivePermissionMode and permissionSource before diagnosing sandbox, git,
+  desktop, or backend permission failures.
+
+Orchestrator idempotency:
+  Reusing the same request id with the same prompt/model/thinking/permission
+  returns the same turn. Reusing it with different prompt/model/thinking/
+  permission returns REQUEST_ID_CONFLICT.
+
 Concepts:
   Loaded session: a Happy Elves control-plane session that can be operated by
   this CLI.
@@ -282,8 +302,9 @@ Output modes:
   thread's history is unavailable, the item reports historyStatus/historyError
   instead of pretending to be healthy inProgress.
   send-message requires --request-id and is detached by default. Reusing the
-  same request id with the same prompt/model/thinking returns the same turn;
-  reusing it with different prompt/model/thinking returns REQUEST_ID_CONFLICT.
+  same request id with the same prompt/model/thinking/permission returns the
+  same turn; reusing it with different prompt/model/thinking/permission returns
+  REQUEST_ID_CONFLICT.
   After send-message, keep the orchestrator turn open and wait on the exact
   returned turn id until terminal. Do not stop after dispatching the prompt.
   For direct handoff, prefer handoff or send-message --context-turn. The CLI

package/apps/cli/dist/commands/machine.js

@@ -6,6 +6,8 @@ function structuredMachineSummary(machine) {
         machineId: machine.id,
         name: machine.metadata.name ?? machine.name,
         online: machine.online,
+        archived: Boolean(machine.archivedAt),
+        archivedAt: machine.archivedAt,
         sessionCount: summary.sessionCount,
         runningCount: summary.runningSessionCount,
         blockedCount: summary.blockedSessionCount,
@@ -15,6 +17,8 @@ function structuredMachineVerbose(machine) {
     return {
         machineId: machine.id,
         online: machine.online,
+        archived: Boolean(machine.archivedAt),
+        archivedAt: machine.archivedAt,
         lastSeen: machine.lastSeen,
         name: machine.metadata.name ?? machine.name,
         defaultCwd: machine.defaultCwd,
@@ -28,14 +32,17 @@ function structuredMachineVerbose(machine) {
 function printMachineLine(machine) {
     const name = machine.metadata.name ?? machine.name;
     const summary = machine.summary;
-    console.log(`${machine.id}  ${machine.online ? "online" : "offline"}  ${compactText(name, 32)}  sessions:${summary.sessionCount} running:${summary.runningSessionCount} blocked:${summary.blockedSessionCount}`);
+    const state = machine.archivedAt ? "archived" : machine.online ? "online" : "offline";
+    console.log(`${machine.id}  ${state}  ${compactText(name, 32)}  sessions:${summary.sessionCount} running:${summary.runningSessionCount} blocked:${summary.blockedSessionCount}`);
 }
 function printMachineDetails(machine) {
     const name = machine.metadata.name ?? machine.name;
     const agents = machine.capabilities.agents.map((agent) => agent.id).join(", ") || "-";
     const summary = machine.summary;
     console.log(`${name} (${machine.id})`);
-    console.log(`  status: ${machine.online ? "online" : "offline"}  agents: ${agents}`);
+    console.log(`  status: ${machine.archivedAt ? "archived" : machine.online ? "online" : "offline"}  agents: ${agents}`);
+    if (machine.archivedAt)
+        console.log(`  archived: ${new Date(machine.archivedAt).toISOString()}`);
     console.log(`  cwd: ${machine.defaultCwd ?? "-"}`);
     console.log(`  sessions: ${summary.sessionCount} total, ${summary.runningSessionCount} running, ${summary.readySessionCount} ready, ${summary.needsUserSessionCount} needs user`);
     console.log(`  sessions: happy-elves session list --machine ${machine.id} --limit 20`);
@@ -171,7 +178,7 @@ export async function handleMachine({ domain, action, positional, flags }) {
         return true;
     }
     if (action === "list") {
-        const snapshot = await client.snapshot();
+        const snapshot = await client.snapshot({ includeArchived: flags["include-archived"] === true });
         const machines = await Promise.all(snapshot.machines.map(async (machine) => ({
             ...(await showMachine(client, machine)),
             ...(await machineSessionOverview(client, snapshot.sessions, machine.id)),
@@ -192,9 +199,26 @@ export async function handleMachine({ domain, action, positional, flags }) {
         });
         return true;
     }
+    if (action === "archive" || action === "unarchive" || action === "restore") {
+        const machineId = requirePositional(positional[0], "machineId");
+        const machine = action === "archive"
+            ? await client.archiveMachine(machineId)
+            : await client.unarchiveMachine(machineId);
+        const projectedMachine = await showMachine(client, machine);
+        const overviewSnapshot = await client.snapshot({ includeArchived: true });
+        const overview = await machineSessionOverview(client, overviewSnapshot.sessions, machine.id);
+        if (!wantsJson(flags)) {
+            printMachineLine({ ...projectedMachine, ...overview });
+            return true;
+        }
+        ok(action === "archive" ? "machine.archive" : "machine.unarchive", {
+            machine: structuredMachineVerbose({ ...projectedMachine, ...overview }),
+        }, { machineId: machine.id });
+        return true;
+    }
     if (action === "status") {
         const machineId = requirePositional(positional[0], "machineId");
-        const snapshot = await client.snapshot();
+        const snapshot = await client.snapshot({ includeArchived: flags["include-archived"] === true });
         const machine = snapshot.machines.find((item) => item.id === machineId);
         if (!machine)
             throw new CliError("Machine not found", "MACHINE_NOT_FOUND");
@@ -212,7 +236,7 @@ export async function handleMachine({ domain, action, positional, flags }) {
                 machineId: machine.id,
                 name: projectedMachine.metadata.name ?? machine.name,
                 online: machine.online,
-                state: machine.online ? "available" : "offline",
+                state: machine.archivedAt ? "archived" : machine.online ? "available" : "offline",
                 summary: overview.summary,
             }),
         }, { machineId: machine.id });