@cydm/happy-elves 0.1.0-beta.310 → 0.1.0-beta.312

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

@@ -116,8 +116,15 @@ const booleanFlags = new Set([
 ]);
 const knownFlags = new Set([...valueFlags, ...booleanFlags]);
 const dashPrefixedValueFlags = new Set(["secret"]);
+const repeatableValueFlags = new Set([
+    "tag",
+    "tags",
+    "release-tag",
+    "reviewer-tag",
+    "dogfood-tag",
+]);
 export function parseCliFlags(argv) {
-    const parsed = parseSharedFlags(argv, { valueFlags, dashPrefixedValueFlags });
+    const parsed = parseSharedFlags(argv, { valueFlags, dashPrefixedValueFlags, repeatableValueFlags });
     const unknown = Object.keys(parsed.flags).filter((flag) => !knownFlags.has(flag));
     if (unknown.length > 0) {
         throw new CliError(`Unknown flag: --${unknown[0]}`, "UNKNOWN_FLAG");

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

@@ -14,7 +14,10 @@ export async function topLevelStatus(flags) {
     const relayError = snapshotResult.status === "rejected"
         ? snapshotResult.reason instanceof Error ? snapshotResult.reason.message : String(snapshotResult.reason)
         : undefined;
-    const latestSession = snapshot ? [...snapshot.sessions].sort((left, right) => right.updatedAt - left.updatedAt)[0] : undefined;
+    const visibleSessions = snapshot
+        ? await visibleStatusSessions(client, snapshot.sessions)
+        : [];
+    const latestSession = [...visibleSessions].sort((left, right) => right.updatedAt - left.updatedAt)[0];
     const latestOutput = latestSession ? await readStoredTurnOutput(latestSession.id).catch(() => undefined) : undefined;
     const latestRelayOutput = latestSession && !latestOutput
         ? lastAssistantOutput(await client.history(latestSession.id, 200).catch(() => []))
@@ -31,8 +34,8 @@ export async function topLevelStatus(flags) {
             onlineCount: snapshot?.machines.filter((machine) => machine.online).length ?? 0,
         },
         sessions: {
-            count: snapshot?.sessions.length ?? 0,
-            runningCount: snapshot?.sessions.filter((session) => session.status === "running").length ?? 0,
+            count: visibleSessions.length,
+            runningCount: visibleSessions.filter((session) => session.status === "running").length,
         },
         latestSession: latestSession ? {
             sessionId: latestSession.id,
@@ -64,4 +67,13 @@ export async function topLevelStatus(flags) {
     if (!data.relay.ok)
         process.exitCode = 1;
 }
+async function visibleStatusSessions(client, sessions) {
+    const projected = await Promise.all(sessions.map(async (session) => ({
+        session,
+        metadata: await client.decodeSessionMetadata(session).catch(() => ({})),
+    })));
+    return projected
+        .filter(({ session, metadata }) => session.status !== "closed" && metadata.hiddenFromWorkspace !== true && metadata.source !== "dogfood")
+        .map(({ session }) => session);
+}
 //# sourceMappingURL=status.js.map

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

@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import { normalizeSessionTags, sessionTagsMatch } from "../../../../packages/shared/dist/index.js";
-import { CliError, ControllerClient, DEFAULT_COMMAND_TIMEOUT_MS, compactText, ok, parseDurationMs, readConfig, releaseProfilesPath, wantsJson, } from "./lib/index.js";
+import { CliError, ControllerClient, DEFAULT_COMMAND_TIMEOUT_MS, compactText, ok, parseDurationMs, readConfig, releaseProfilesPath, wantsJson, wantsVerbose, } from "./lib/index.js";
 const defaultReleaseProfile = {
     name: "happy-elves",
     releaseSessionTags: ["Happy Elves", "Release Session"],
@@ -61,7 +61,7 @@ export async function handleRelease({ domain, action, positional, flags }) {
             ackTimeoutMs: parseDurationMs(flags["ack-timeout"], 15_000),
             inactivityTimeoutMs: parseDurationMs(flags["inactivity-timeout"] ?? flags["runtime-timeout"], DEFAULT_COMMAND_TIMEOUT_MS),
         });
-        printReleaseOutput("release.notify", {
+        printReleaseOutput("release.notify", await releaseNotifyOutput(client, {
             profile: profile.name,
             releaseTarget,
             prompt: text,
@@ -70,7 +70,7 @@ export async function handleRelease({ domain, action, positional, flags }) {
             memoryMode: "off",
             wait,
             ...result,
-        }, flags);
+        }, flags), flags);
         return true;
     }
     return false;
@@ -82,6 +82,33 @@ function releaseNotifyText(flags) {
     const value = typeof flags.text === "string" ? flags.text.trim() : "";
     return value || "发布";
 }
+async function releaseNotifyOutput(client, data, flags) {
+    if (wantsVerbose(flags))
+        return data;
+    const decoded = await client.decodeEvents(data.events).catch(() => []);
+    const turnEvents = data.turnId ? decoded.filter((event) => event.turnId === data.turnId) : decoded;
+    const done = [...turnEvents].reverse().find((event) => event.decoded?.type === "done")?.decoded;
+    const finalOutput = turnEvents
+        .filter((event) => event.decoded?.type === "text_delta" && event.decoded.stream !== "thought")
+        .map((event) => event.decoded?.type === "text_delta" ? event.decoded.text : "")
+        .join("");
+    return {
+        profile: data.profile,
+        releaseTarget: data.releaseTarget,
+        promptPreview: data.promptPreview,
+        permissionMode: data.permissionMode,
+        memoryMode: data.memoryMode,
+        wait: data.wait,
+        requestId: data.requestId,
+        sessionId: data.sessionId,
+        turnId: data.turnId,
+        admission: data.admission,
+        dispatch: data.dispatch,
+        eventCount: data.events.length,
+        ...(done && typeof done === "object" && "status" in done ? { status: done.status } : {}),
+        ...(finalOutput ? { finalOutputPreview: compactText(finalOutput, 1200) } : {}),
+    };
+}
 function tagsFromFlagValue(value) {
     if (typeof value !== "string")
         return [];

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

@@ -406,7 +406,7 @@ export async function handleSession({ domain, action, positional, flags }) {
         const visibleSessions = flags.all === true
             ? allSessions
             : (await Promise.all(allSessions.map(async (session) => ({ session, metadata: await client.decodeSessionMetadata(session) }))))
-                .filter(({ session, metadata }) => session.status !== "closed" && metadata.hiddenFromWorkspace !== true)
+                .filter(({ session, metadata }) => session.status !== "closed" && metadata.hiddenFromWorkspace !== true && metadata.source !== "dogfood")
                 .map(({ session }) => session);
         const { items: sessions, page } = selectWindow(visibleSessions, flags, 20);
         if (wantsJson(flags) || wantsVerbose(flags)) {

package/apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-cli",
-  "version": "0.1.0-beta.310",
+  "version": "0.1.0-beta.312",
   "private": true,
   "type": "module"
 }

package/apps/daemon/dist/session/lifecycle.js

@@ -17,6 +17,8 @@ export async function handleCreateSession(ws, config, command) {
         const metadata = await commandSessionMetadata(config, command.encryptedMetadata);
         const model = modelFromCommand(command.model ?? metadata?.model);
         const tags = normalizeSessionTags(metadata?.tags);
+        const hiddenFromWorkspace = metadata?.hiddenFromWorkspace === true;
+        const source = typeof metadata?.source === "string" && metadata.source.trim() ? metadata.source.trim() : undefined;
         const runtime = getRuntime(cwd);
         let handle = await runtime.ensureSession({
             sessionKey: command.sessionId,
@@ -44,6 +46,8 @@ export async function handleCreateSession(ws, config, command) {
             name: providerName ?? command.name,
             ...(model ? { model } : {}),
             ...(tags.length > 0 ? { tags } : {}),
+            ...(hiddenFromWorkspace ? { hiddenFromWorkspace: true } : {}),
+            ...(source ? { source } : {}),
             handle,
         };
         sessions.set(command.sessionId, state);
@@ -111,6 +115,15 @@ export async function handleImportHistoricalSession(ws, config, command) {
             handle,
         };
         const importedMetadata = await commandSessionMetadata(config, command.encryptedMetadata);
+        const importedTags = normalizeSessionTags(importedMetadata?.tags);
+        const importedHiddenFromWorkspace = importedMetadata?.hiddenFromWorkspace === true;
+        const importedSource = typeof importedMetadata?.source === "string" && importedMetadata.source.trim() ? importedMetadata.source.trim() : undefined;
+        if (importedTags.length > 0)
+            state.tags = importedTags;
+        if (importedHiddenFromWorkspace)
+            state.hiddenFromWorkspace = true;
+        if (importedSource)
+            state.source = importedSource;
         sessions.set(command.sessionId, state);
         const importedAt = new Date().toISOString();
         const importedMetadataBase = {
@@ -261,9 +274,12 @@ function historicalSessionPage(value) {
 export async function resumeSession(ws, config, sessionId, requestId, fallback, announceSuccess = true, syncDirection = "auto") {
     const existing = sessions.get(sessionId);
     if (existing) {
-        const hydratedExisting = fallback?.tags && fallback.tags.length > 0
-            ? { ...existing, tags: fallback.tags }
-            : existing;
+        const hydratedExisting = {
+            ...existing,
+            ...(fallback?.tags && fallback.tags.length > 0 ? { tags: fallback.tags } : {}),
+            ...(fallback?.hiddenFromWorkspace === true ? { hiddenFromWorkspace: true } : {}),
+            ...(fallback?.source ? { source: fallback.source } : {}),
+        };
         if (hydratedExisting !== existing)
             sessions.set(sessionId, hydratedExisting);
         const refreshed = await refreshRuntimeSessionName(hydratedExisting);
@@ -324,6 +340,8 @@ export async function resumeSession(ws, config, sessionId, requestId, fallback,
             cwd,
             name,
             ...(fallback?.tags && fallback.tags.length > 0 ? { tags: fallback.tags } : {}),
+            ...(fallback?.hiddenFromWorkspace === true ? { hiddenFromWorkspace: true } : {}),
+            ...(fallback?.source ? { source: fallback.source } : {}),
             handle,
         });
         sessions.set(sessionId, state);

package/apps/daemon/dist/session/metadata.d.ts

@@ -1,6 +1,6 @@
 import { type EncryptedEnvelope, type MachineCommand } from "../../../../packages/shared/dist/index.js";
 import type { DaemonConfig, SessionFallback, SessionMetadata, SessionState } from "../types.js";
-export declare function encryptedSessionMetadata(config: DaemonConfig, sessionId: string, state: Pick<SessionState, "agent" | "cwd" | "name" | "handle" | "model" | "tags">, extra: Record<string, unknown>): Promise<EncryptedEnvelope>;
+export declare function encryptedSessionMetadata(config: DaemonConfig, sessionId: string, state: Pick<SessionState, "agent" | "cwd" | "name" | "handle" | "model" | "tags" | "hiddenFromWorkspace" | "source">, extra: Record<string, unknown>): Promise<EncryptedEnvelope>;
 export declare function commandSessionMetadata(config: DaemonConfig, encryptedMetadata?: EncryptedEnvelope): Promise<SessionMetadata | undefined>;
 export declare function sessionFallbackFromCommand(config: DaemonConfig, command: Extract<MachineCommand, {
     type: "machine:prompt" | "machine:resume" | "machine:rewind" | "machine:fork" | "machine:renameSession" | "machine:close";

package/apps/daemon/dist/session/metadata.js

@@ -6,6 +6,8 @@ export function encryptedSessionMetadata(config, sessionId, state, extra) {
         name: state.name,
         ...(state.model ? { model: state.model } : {}),
         ...(state.tags && state.tags.length > 0 ? { tags: state.tags, tagKeys: sessionTagKeys(state.tags) } : {}),
+        ...(state.hiddenFromWorkspace ? { hiddenFromWorkspace: true } : {}),
+        ...(state.source ? { source: state.source } : {}),
         runtime: {
             backend: state.handle.backend,
             runtimeSessionName: state.handle.runtimeSessionName,
@@ -41,6 +43,8 @@ export async function sessionFallbackFromCommand(config, command) {
             name: metadata.name ?? command.sessionId,
             ...(typeof metadata.model === "string" && metadata.model.trim() ? { model: metadata.model.trim() } : {}),
             ...(tags.length > 0 ? { tags } : {}),
+            ...(metadata.hiddenFromWorkspace === true ? { hiddenFromWorkspace: true } : {}),
+            ...(typeof metadata.source === "string" && metadata.source.trim() ? { source: metadata.source.trim() } : {}),
             emptyRuntimeSession: metadata.emptyRuntimeSession === true,
             historicalBackfill: historicalBackfillStateFromMetadata(metadata),
             runtime: metadata.runtime,

package/apps/daemon/dist/session/prompt.js

@@ -36,6 +36,14 @@ export async function handlePrompt(ws, config, command) {
     }
     if (fallback?.tags && fallback.tags.length > 0) {
         session = { ...session, tags: fallback.tags };
+    }
+    if (fallback?.hiddenFromWorkspace === true) {
+        session = { ...session, hiddenFromWorkspace: true };
+    }
+    if (fallback?.source) {
+        session = { ...session, source: fallback.source };
+    }
+    if (session !== sessions.get(command.sessionId)) {
         sessions.set(command.sessionId, session);
     }
     if (!claimSessionTurn(command.sessionId, command.requestId, command.turnId, "prompt")) {

package/apps/daemon/dist/types.d.ts

@@ -33,6 +33,8 @@ export type SessionState = {
     name: string;
     model?: string;
     tags?: string[];
+    hiddenFromWorkspace?: boolean;
+    source?: string;
     handle: RuntimeHandle;
     historicalBackfill?: HistoricalBackfillState;
 };
@@ -58,6 +60,8 @@ export type SessionMetadata = {
     model?: string;
     tags?: string[];
     tagKeys?: string[];
+    hiddenFromWorkspace?: boolean;
+    source?: string;
     requestedRuntimeName?: string;
     permissionMode?: PermissionMode;
     importedFromRuntimeSessionId?: string;
@@ -90,6 +94,8 @@ export type SessionMetadata = {
 export type SessionFallback = Pick<SessionState, "agent" | "cwd" | "name"> & {
     model?: string;
     tags?: string[];
+    hiddenFromWorkspace?: boolean;
+    source?: string;
     emptyRuntimeSession?: boolean;
     historicalBackfill?: HistoricalBackfillState;
     runtime?: SessionMetadata["runtime"];

package/apps/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-daemon",
-  "version": "0.1.0-beta.310",
+  "version": "0.1.0-beta.312",
   "private": true,
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves",
-  "version": "0.1.0-beta.310",
+  "version": "0.1.0-beta.312",
   "description": "Remote controller for local coding agents with hosted or self-hosted relay support.",
   "type": "module",
   "bin": {

package/packages/shared/dist/args.d.ts

@@ -5,6 +5,7 @@ export type ParsedArgs = {
 export type ParseFlagsOptions = {
     valueFlags?: Iterable<string>;
     dashPrefixedValueFlags?: Iterable<string>;
+    repeatableValueFlags?: Iterable<string>;
 };
 export declare function parseFlags(argv: string[], options?: ParseFlagsOptions): ParsedArgs;
 //# sourceMappingURL=args.d.ts.map

package/packages/shared/dist/args.js

@@ -1,6 +1,7 @@
 export function parseFlags(argv, options = {}) {
     const valueFlags = new Set(options.valueFlags ?? []);
     const dashPrefixedValueFlags = new Set(options.dashPrefixedValueFlags ?? []);
+    const repeatableValueFlags = new Set(options.repeatableValueFlags ?? []);
     const positional = [];
     const flags = {};
     for (let i = 0; i < argv.length; i++) {
@@ -19,17 +20,22 @@ export function parseFlags(argv, options = {}) {
             flags[key] = true;
         }
         else if (valueFlags.has(key) && (!next.startsWith("--") || dashPrefixedValueFlags.has(key))) {
-            flags[key] = next;
+            flags[key] = appendFlagValue(flags[key], next, repeatableValueFlags.has(key));
             i++;
         }
         else if (next.startsWith("--")) {
             flags[key] = true;
         }
         else {
-            flags[key] = next;
+            flags[key] = appendFlagValue(flags[key], next, repeatableValueFlags.has(key));
             i++;
         }
     }
     return { positional, flags };
 }
+function appendFlagValue(previous, next, repeatable) {
+    if (!repeatable || previous === undefined || previous === true || previous === false)
+        return next;
+    return `${previous},${next}`;
+}
 //# sourceMappingURL=args.js.map