@tryglen/cli 0.37.1 → 0.38.0

package/dist/commands/skill/share.js

@@ -0,0 +1,52 @@
+import { cliErr } from "../../core/errors/cli-error.js";
+import { config } from "../../clients/glen-api/config.js";
+import { callGlen } from "../../clients/glen-api/glen-api.js";
+import { out } from "../../core/terminal/out.js";
+import { err, mapErr, ok } from "../../core/errors/result.js";
+import { explainSkillError } from "./_utils/explain-skill-error.js";
+import { skillOptions } from "./skill.options.js";
+const SKILL_SHARE_TIMEOUT_MS = 60_000;
+const plural = (n, word) => `${n} ${word}${n === 1 ? "" : "s"}`;
+const skillShare = skillOptions.handle(async (opts) => {
+    const s = opts.arg?.trim();
+    if (!s)
+        return err(cliErr("Usage", {
+            code: "skill.missing_slug",
+            what: "missing skill slug",
+            remedy: "usage: glen skill share <slug> [--with <email>[,<email>…]] [--org]",
+        }));
+    const emails = (opts.with ?? "")
+        .split(",")
+        .map((e) => e.trim())
+        .filter(Boolean);
+    if (emails.length === 0 && !opts.org)
+        return err(cliErr("Usage", {
+            code: "skill.nothing_to_share",
+            what: "nothing to share",
+            remedy: "pass --with <email>[,<email>…] to add teammates and/or --org for the whole org",
+        }));
+    const res = mapErr(await callGlen("skillShare", {
+        slug: s,
+        ...(emails.length > 0 ? { emails } : {}),
+        ...(opts.org ? { org: true } : {}),
+    }, { timeoutMs: SKILL_SHARE_TIMEOUT_MS }), explainSkillError);
+    if (!res.ok)
+        return res;
+    const { recipientCount, sharedWithOrg, sharedSubskillCount, foreignPrivate, } = res.value;
+    const visibility = sharedWithOrg
+        ? "the whole org"
+        : recipientCount > 0
+            ? plural(recipientCount, "teammate")
+            : "only you";
+    out.success(`skill "${res.value.slug}" is now visible to ${visibility}.`);
+    if (sharedSubskillCount > 0)
+        out.success(`also shared ${plural(sharedSubskillCount, "subskill")} it references.`);
+    if (foreignPrivate.length > 0)
+        out.warn(`couldn't share ${foreignPrivate.length} (not yours): ${foreignPrivate
+            .map((f) => `${f.name} (by ${f.ownerName})`)
+            .join(", ")}`);
+    out.hint(`manage sharing: ${config.baseUrl}/dynamic-skills/${encodeURIComponent(res.value.slug)}`);
+    return ok(undefined);
+});
+export { skillShare };
+//# sourceMappingURL=share.js.map

package/dist/commands/skill/share.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"share.js","sourceRoot":"","sources":["../../../src/commands/skill/share.ts"],"names":[],"mappings":"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"}

package/dist/commands/skill/skill.options.js

@@ -0,0 +1,58 @@
+import { cliInput } from "../../core/run/cli-input.js";
+const text = (z) => z.string().optional();
+const skillOptions = cliInput.define({
+    usage: "glen skill search [query] | glen skill use <slug> | glen skill create | glen skill share <slug>",
+    args: {
+        action: (z) => z.enum(["search", "use", "create", "share"]),
+        arg: text,
+    },
+    flags: {
+        by: {
+            flag: "--by <author>",
+            help: "skill search: filter by author name (or 'me')",
+            schema: text,
+        },
+        name: {
+            flag: "--name <name>",
+            help: "skill create: the skill's name",
+            schema: text,
+        },
+        description: {
+            flag: "--description <description>",
+            help: "skill create: one-line description",
+            schema: text,
+        },
+        file: {
+            flag: "--file <path>",
+            help: "skill create: path to the SKILL.md body",
+            schema: text,
+        },
+        dir: {
+            flag: "--dir <path>",
+            help: "skill create: path to a skill directory (SKILL.md + scripts/ references/ assets/)",
+            schema: text,
+        },
+        deps: {
+            flag: "--deps <path>",
+            help: "skill create: path to a JSON array of dependencies",
+            schema: text,
+        },
+        update: {
+            flag: "--update",
+            help: "skill create: overwrite your own same-named skill",
+            schema: (z) => z.boolean().default(false),
+        },
+        org: {
+            flag: "--org",
+            help: "skill create/share: share with your whole org (create default: private to you)",
+            schema: (z) => z.boolean().default(false),
+        },
+        with: {
+            flag: "--with <emails>",
+            help: "skill share: comma-separated teammate emails to add",
+            schema: text,
+        },
+    },
+});
+export { skillOptions };
+//# sourceMappingURL=skill.options.js.map

package/dist/commands/skill/skill.options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill.options.js","sourceRoot":"","sources":["../../../src/commands/skill/skill.options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,MAAM,IAAI,GAAG,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC;AAEtD,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;IACnC,KAAK,EACH,iGAAiG;IACnG,IAAI,EAAE;QACJ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3D,GAAG,EAAE,IAAI;KACV;IACD,KAAK,EAAE;QACL,EAAE,EAAE;YACF,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,+CAA+C;YACrD,MAAM,EAAE,IAAI;SACb;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,gCAAgC;YACtC,MAAM,EAAE,IAAI;SACb;QACD,WAAW,EAAE;YACX,IAAI,EAAE,6BAA6B;YACnC,IAAI,EAAE,oCAAoC;YAC1C,MAAM,EAAE,IAAI;SACb;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,yCAAyC;YAC/C,MAAM,EAAE,IAAI;SACb;QACD,GAAG,EAAE;YACH,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,mFAAmF;YACzF,MAAM,EAAE,IAAI;SACb;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,oDAAoD;YAC1D,MAAM,EAAE,IAAI;SACb;QACD,MAAM,EAAE;YACN,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,mDAAmD;YACzD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;SAC1C;QACD,GAAG,EAAE;YACH,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,gFAAgF;YACtF,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;SAC1C;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,qDAAqD;YAC3D,MAAM,EAAE,IAAI;SACb;KACF;CACF,CAAC,CAAC;AAEH,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/commands/skill/use.js

@@ -0,0 +1,72 @@
+import { cliErr } from "../../core/errors/cli-error.js";
+import { callGlen } from "../../clients/glen-api/glen-api.js";
+import { out } from "../../core/terminal/out.js";
+import { err, mapErr, ok } from "../../core/errors/result.js";
+import { sessionMap } from "../../core/state/session-map.js";
+import { explainSkillError } from "./_utils/explain-skill-error.js";
+import { skillCache } from "./_utils/skill-cache.js";
+const SKILL_USE_TIMEOUT_MS = 60_000;
+const provenance = (s) => `> Glen skill "${s.name}" by ${s.author.name}, updated ${s.updatedAt.slice(0, 10)}\n\n`;
+// Failures go to stderr: stdout is the skill text the agent reads.
+const cachePrefetched = async (skill, base) => {
+    const results = await Promise.all(skill.prefetch.map(async (manifest) => ({
+        slug: manifest.slug,
+        cached: await skillCache.materialize(manifest, base),
+    })));
+    for (const { slug, cached } of results)
+        if (!cached.ok)
+            out.warn({
+                ...cached.error,
+                what: `could not cache the prefetched skill "${slug}": ${cached.error.what}`,
+            });
+};
+const skillText = async (skill, base) => {
+    if (skill.files.length > 0) {
+        const dir = await skillCache.materialize(skill, base);
+        if (!dir.ok)
+            return dir;
+        return ok(skillCache.substituteDir(skill.content, dir.value));
+    }
+    // Nothing else clears this dir, and a stale .glen-meta.json would keep claiming it's cached.
+    const removed = await skillCache.remove(base, skill.slug);
+    if (!removed.ok)
+        out.warn(removed.error);
+    return ok(skill.content);
+};
+const skillUse = async (slug) => {
+    const s = slug?.trim();
+    if (!s)
+        return err(cliErr("Usage", {
+            code: "skill.missing_slug",
+            what: "missing skill slug",
+            remedy: "usage: glen skill use <slug> (find slugs with `glen skill search`)",
+        }));
+    const conversationId = await sessionMap.forCwd(process.cwd());
+    const base = skillCache.baseDir();
+    const cached = await skillCache.cachedMap(base);
+    const res = mapErr(await callGlen("skillUse", {
+        slug: s,
+        ...(conversationId ? { conversationId } : {}),
+        ...(Object.keys(cached).length > 0 ? { cached } : {}),
+    }, { timeoutMs: SKILL_USE_TIMEOUT_MS }), explainSkillError);
+    if (!res.ok)
+        return res;
+    const skill = res.value;
+    await cachePrefetched(skill, base);
+    const text = await skillText(skill, base);
+    if (!text.ok)
+        return text;
+    if (!text.value.trim()) {
+        out.info("glen: that skill has no content.");
+        return ok(undefined);
+    }
+    out.data(`${provenance(skill)}${text.value}`);
+    if (skill.dependencies.length > 0)
+        out.data([
+            "\n## Requirements",
+            ...skill.dependencies.map((d) => `- ${d.name} (${d.kind}): ${d.description} (${d.sourceUrl})`),
+        ].join("\n"));
+    return ok(undefined);
+};
+export { skillUse };
+//# sourceMappingURL=use.js.map

package/dist/commands/skill/use.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../src/commands/skill/use.ts"],"names":[],"mappings":"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"}

package/dist/commands/status/index.js

@@ -0,0 +1,33 @@
+import { config } from "../../clients/glen-api/config.js";
+import { credentials } from "../../core/state/credentials.js";
+import { out } from "../../core/terminal/out.js";
+import { ok } from "../../core/errors/result.js";
+import { glenState } from "../../core/state/state.js";
+import { cliVersion } from "../../core/system/version.js";
+const status = async () => {
+    const [creds, state] = await Promise.all([
+        credentials.read(),
+        glenState.read(),
+    ]);
+    out.info(`🏔️ glen ${cliVersion}`);
+    out.info(creds
+        ? `connected with an API key. Base: ${config.baseUrl}`
+        : `not connected. Base: ${config.baseUrl}`, { indent: 1 });
+    if (state) {
+        const name = state.activeOrgName ? ` (${state.activeOrgName})` : "";
+        out.info(`org: ${state.activeOrgSlug ?? state.activeOrgId}${name}`, {
+            indent: 1,
+        });
+        out.info(`mode: ${state.mode}`, { indent: 1 });
+    }
+    else {
+        out.info("org: none", { indent: 1 });
+    }
+    if (!creds)
+        out.hint("run `glen login` to connect");
+    else if (!state)
+        out.hint("run `glen org switch` to pick an organization");
+    return ok(undefined);
+};
+export { status };
+//# sourceMappingURL=index.js.map

package/dist/commands/status/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/status/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAe,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,MAAM,MAAM,GAAG,KAAK,IAAqC,EAAE;IACzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvC,WAAW,CAAC,IAAI,EAAE;QAClB,SAAS,CAAC,IAAI,EAAE;KACjB,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC,CAAC;IACnC,GAAG,CAAC,IAAI,CACN,KAAK;QACH,CAAC,CAAC,oCAAoC,MAAM,CAAC,OAAO,EAAE;QACtD,CAAC,CAAC,wBAAwB,MAAM,CAAC,OAAO,EAAE,EAC5C,EAAE,MAAM,EAAE,CAAC,EAAE,CACd,CAAC;IACF,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW,GAAG,IAAI,EAAE,EAAE;YAClE,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,KAAK;QAAE,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;SAC/C,IAAI,CAAC,KAAK;QAAE,GAAG,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAC3E,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/dist/commands/status/status.options.js

@@ -0,0 +1,4 @@
+import { cliInput } from "../../core/run/cli-input.js";
+const statusOptions = cliInput.define({});
+export { statusOptions };
+//# sourceMappingURL=status.options.js.map

package/dist/commands/status/status.options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status.options.js","sourceRoot":"","sources":["../../../src/commands/status/status.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/commands/statusline/index.js

@@ -0,0 +1,33 @@
+import { credentials } from "../../core/state/credentials.js";
+import { out } from "../../core/terminal/out.js";
+import { readStdin } from "../../core/terminal/read-stdin.js";
+import { ok } from "../../core/errors/result.js";
+import { glenState } from "../../core/state/state.js";
+import { recordEvent } from "../../core/telemetry/record-event.js";
+// Runs on every UI refresh: no server calls, and it must always print a line.
+const statusline = async () => {
+    // The event on stdin isn't used; drain it so the agent's pipe doesn't block.
+    const drained = await readStdin();
+    if (!drained.ok)
+        recordEvent("warn", drained.error);
+    const creds = await credentials.read();
+    const state = await glenState.read();
+    const line = (() => {
+        if (!creds)
+            return '🏔️ glen · not connected · ask me to "set up glen"';
+        if (!state)
+            return '🏔️ glen · no org selected · ask me to "set up glen"';
+        const orgDisplay = state.activeOrgName ?? state.activeOrgSlug ?? state.activeOrgId;
+        if (state.mode === "off")
+            return `🏔️ ${orgDisplay} · ⏸️ off`;
+        if (state.mode === "incognito")
+            return `🏔️ ${orgDisplay} · 🕶️ incognito`;
+        if (state.mode === "silent")
+            return `🏔️ ${orgDisplay} · 🤫 silent`;
+        return `🏔️ ${orgDisplay}`;
+    })();
+    out.hookText(line);
+    return ok(undefined);
+};
+export { statusline };
+//# sourceMappingURL=index.js.map

package/dist/commands/statusline/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/statusline/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAe,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,8EAA8E;AAC9E,MAAM,UAAU,GAAG,KAAK,IAAqC,EAAE;IAC7D,6EAA6E;IAC7E,MAAM,OAAO,GAAG,MAAM,SAAS,EAAE,CAAC;IAClC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;IAErC,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE;QACjB,IAAI,CAAC,KAAK;YAAE,OAAO,oDAAoD,CAAC;QACxE,IAAI,CAAC,KAAK;YAAE,OAAO,sDAAsD,CAAC;QAC1E,MAAM,UAAU,GACd,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW,CAAC;QAClE,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO,OAAO,UAAU,WAAW,CAAC;QAC9D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,OAAO,UAAU,kBAAkB,CAAC;QAC3E,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,OAAO,UAAU,cAAc,CAAC;QACpE,OAAO,OAAO,UAAU,EAAE,CAAC;IAC7B,CAAC,CAAC,EAAE,CAAC;IAEL,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/commands/statusline/statusline.options.js

@@ -0,0 +1,4 @@
+import { cliInput } from "../../core/run/cli-input.js";
+const statuslineOptions = cliInput.define({});
+export { statuslineOptions };
+//# sourceMappingURL=statusline.options.js.map

package/dist/commands/statusline/statusline.options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statusline.options.js","sourceRoot":"","sources":["../../../src/commands/statusline/statusline.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/commands/suggestions/index.js

@@ -0,0 +1,36 @@
+import { cliErr } from "../../core/errors/cli-error.js";
+import { callGlen } from "../../clients/glen-api/glen-api.js";
+import { out } from "../../core/terminal/out.js";
+import { err, mapErr, ok } from "../../core/errors/result.js";
+import { glenState } from "../../core/state/state.js";
+import { suggestionsOptions } from "./suggestions.options.js";
+const KINDS = {
+    "skill-create": "skillCreation",
+    "skill-use": "skillUse",
+};
+const confirmations = {
+    "skill-create": {
+        on: "🏔️ glen will suggest turning finished work into team skills (account-wide).",
+        off: "🏔️ glen will no longer suggest creating new skills, on any machine or agent. Re-enable with `glen suggestions skill-create on`.",
+    },
+    "skill-use": {
+        on: "🏔️ glen will recommend matching team skills when you start something (account-wide).",
+        off: "🏔️ glen will no longer recommend existing team skills, on any machine or agent. Re-enable with `glen suggestions skill-use on`.",
+    },
+};
+const suggestions = suggestionsOptions.handle(async ({ kind, state: stateArg }) => {
+    const state = await glenState.read();
+    if (!state)
+        return err(cliErr("Auth", {
+            code: "suggestions.no_active_org",
+            what: "no active organization",
+            remedy: "run `glen org switch` (or `glen login`) first",
+        }));
+    const res = mapErr(await callGlen("setSuggestions", { [KINDS[kind]]: stateArg === "on" }), (e) => ({ ...e, what: `${e.what} (nothing changed)` }));
+    if (!res.ok)
+        return res;
+    out.success(confirmations[kind][stateArg]);
+    return ok(undefined);
+});
+export { suggestions };
+//# sourceMappingURL=index.js.map

package/dist/commands/suggestions/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/suggestions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAe,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,KAAK,GAAG;IACZ,cAAc,EAAE,eAAe;IAC/B,WAAW,EAAE,UAAU;CACf,CAAC;AAEX,MAAM,aAAa,GAGf;IACF,cAAc,EAAE;QACd,EAAE,EAAE,8EAA8E;QAClF,GAAG,EAAE,kIAAkI;KACxI;IACD,WAAW,EAAE;QACX,EAAE,EAAE,uFAAuF;QAC3F,GAAG,EAAE,kIAAkI;KACxI;CACF,CAAC;AAEF,MAAM,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAC3C,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAmC,EAAE;IACnE,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;IACrC,IAAI,CAAC,KAAK;QACR,OAAO,GAAG,CACR,MAAM,CAAC,MAAM,EAAE;YACb,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,+CAA+C;SACxD,CAAC,CACH,CAAC;IAEJ,MAAM,GAAG,GAAG,MAAM,CAChB,MAAM,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC,EACtE,CAAC,CAAC,EAAY,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,CACjE,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,GAAG,CAAC;IACxB,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC,CACF,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/dist/commands/suggestions/suggestions.options.js

@@ -0,0 +1,12 @@
+import { cliInput } from "../../core/run/cli-input.js";
+const suggestionsOptions = cliInput.define({
+    usage: "glen suggestions skill-create on|off | glen suggestions skill-use on|off",
+    args: {
+        kind: (z) => z.enum(["skill-create", "skill-use"], {
+            error: (issue) => `invalid suggestion kind ${JSON.stringify(issue.input)}`,
+        }),
+        state: (z) => z.enum(["on", "off"]),
+    },
+});
+export { suggestionsOptions };
+//# sourceMappingURL=suggestions.options.js.map

package/dist/commands/suggestions/suggestions.options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"suggestions.options.js","sourceRoot":"","sources":["../../../src/commands/suggestions/suggestions.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,MAAM,CAAC;IACzC,KAAK,EACH,0EAA0E;IAC5E,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CACV,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE;YACpC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,2BAA2B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;SAC3D,CAAC;QACJ,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACpC;CACF,CAAC,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/commands/takeover/_utils/agent-paths.js

@@ -1,15 +1,17 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { env } from "../../../core/system/env.js";
 const projectKey = (workspace) => workspace.replaceAll("/", "-").replace(/[^A-Za-z0-9._-]/g, "-");
+// pi's own encoding (getDefaultSessionDirPath): no leading separator, `/ \ :` → "-", wrapped in "--".
+const piProjectKey = (workspace) => `--${workspace.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
 const agentPaths = {
     claude(workspace, sessionId) {
-        const root = process.env.GLEN_CLAUDE_HOME ?? join(homedir(), ".claude");
+        const root = env().GLEN_CLAUDE_HOME ?? join(homedir(), ".claude");
         return join(root, "projects", projectKey(workspace), `${sessionId}.jsonl`);
     },
     codex(sessionId, date = new Date()) {
-        const root = process.env.GLEN_CODEX_HOME ?? join(homedir(), ".codex");
-        // Codex parses the session id from this filename: LOCAL time, seconds precision.
-        // Milliseconds or a trailing Z break `codex resume <id>`.
+        const root = env().GLEN_CODEX_HOME ?? join(homedir(), ".codex");
+        // Codex parses the session id from this name: local time, seconds, no Z, or `codex resume` breaks.
         const pad = (value) => String(value).padStart(2, "0");
         const year = String(date.getFullYear());
         const month = pad(date.getMonth() + 1);
@@ -18,10 +20,14 @@ const agentPaths = {
         return join(root, "sessions", year, month, day, `rollout-${timestamp}-${sessionId}.jsonl`);
     },
     pi(workspace, sessionId, date = new Date()) {
-        const root = process.env.GLEN_PI_HOME ?? join(homedir(), ".pi", "agent");
-        const sessionRoot = process.env.PI_CODING_AGENT_SESSION_DIR;
+        const root = env().GLEN_PI_HOME ?? join(homedir(), ".pi", "agent");
+        const sessionRoot = env().PI_CODING_AGENT_SESSION_DIR;
         const timestamp = date.toISOString().replace(/[:.]/g, "-");
-        return join(sessionRoot ?? join(root, "sessions"), projectKey(workspace), `${timestamp}_${sessionId}.jsonl`);
+        const file = `${timestamp}_${sessionId}.jsonl`;
+        // A custom session dir is flat: pi keeps every project's sessions directly in it.
+        return sessionRoot
+            ? join(sessionRoot, file)
+            : join(root, "sessions", piProjectKey(workspace), file);
     },
 };
 export { agentPaths };

package/dist/commands/takeover/_utils/agent-paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-paths.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/agent-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAU,EAAE,CAC/C,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AAElE,MAAM,UAAU,GAAG;IACjB,MAAM,CAAC,SAAiB,EAAE,SAAiB;QACzC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,QAAQ,CAAC,CAAC;IAC7E,CAAC;IACD,KAAK,CAAC,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;QACtE,iFAAiF;QACjF,0DAA0D;QAC1D,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;QACxH,OAAO,IAAI,CACT,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,KAAK,EACL,GAAG,EACH,WAAW,SAAS,IAAI,SAAS,QAAQ,CAC1C,CAAC;IACJ,CAAC;IACD,EAAE,CAAC,SAAiB,EAAE,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC3D,OAAO,IAAI,CACT,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EACrC,UAAU,CAAC,SAAS,CAAC,EACrB,GAAG,SAAS,IAAI,SAAS,QAAQ,CAClC,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"agent-paths.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/agent-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAElD,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAU,EAAE,CAC/C,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AAElE,sGAAsG;AACtG,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAU,EAAE,CACjD,KAAK,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC;AAEnE,MAAM,UAAU,GAAG;IACjB,MAAM,CAAC,SAAiB,EAAE,SAAiB;QACzC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,QAAQ,CAAC,CAAC;IAC7E,CAAC;IACD,KAAK,CAAC,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;QAChE,mGAAmG;QACnG,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;QACxH,OAAO,IAAI,CACT,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,KAAK,EACL,GAAG,EACH,WAAW,SAAS,IAAI,SAAS,QAAQ,CAC1C,CAAC;IACJ,CAAC;IACD,EAAE,CAAC,SAAiB,EAAE,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxD,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,2BAA2B,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,GAAG,SAAS,IAAI,SAAS,QAAQ,CAAC;QAC/C,kFAAkF;QAClF,OAAO,WAAW;YAChB,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC;YACzB,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/commands/takeover/_utils/agent-process.js

@@ -0,0 +1,111 @@
+import { spawn, spawnSync } from "node:child_process";
+import { causeOf } from "../../../core/errors/cli-error.js";
+import { field } from "../../../core/json/json-field.js";
+import { parseJson } from "../../../core/json/parse-json.js";
+import { err, fromSync, ok } from "../../../core/errors/result.js";
+const runInteractive = (binary, args, cwd) => {
+    const ran = spawnSync(binary, [...args], { cwd, stdio: "inherit" });
+    if (ran.error)
+        return err(causeOf(ran.error));
+    return ran.status === 0
+        ? ok(undefined)
+        : err(`exit status ${ran.status ?? "unknown"}`);
+};
+const startJsonRpc = (binary, args, timeoutMs) => {
+    const state = {
+        buffer: "",
+        nextId: 1,
+        ended: null,
+        waiters: [],
+        inbox: [],
+    };
+    const child = fromSync(() => spawn(binary, [...args], { stdio: ["pipe", "pipe", "ignore"] }));
+    const end = (reason) => {
+        if (state.ended)
+            return;
+        state.ended = { kind: "transport", reason };
+        clearTimeout(timer);
+        if (child.ok)
+            child.value.kill();
+        for (const w of state.waiters.splice(0))
+            w.resolve(err(state.ended));
+    };
+    const timer = setTimeout(() => end("timed_out"), timeoutMs);
+    const deliver = (message) => {
+        const index = state.waiters.findIndex((w) => w.match(message));
+        const waiter = index >= 0 ? state.waiters.splice(index, 1)[0] : undefined;
+        if (waiter)
+            waiter.resolve(ok(message));
+        else
+            state.inbox.push(message);
+    };
+    const wait = (match) => {
+        const index = state.inbox.findIndex(match);
+        if (index >= 0)
+            return Promise.resolve(ok(state.inbox.splice(index, 1)[0]));
+        if (state.ended)
+            return Promise.resolve(err(state.ended));
+        return new Promise((resolve) => state.waiters.push({ match, resolve }));
+    };
+    const write = (message) => {
+        if (state.ended || !child.ok)
+            return;
+        const line = `${JSON.stringify({ jsonrpc: "2.0", ...message })}\n`;
+        // A write to a closed pipe also emits 'error' on stdin, which ends the conversation below.
+        void fromSync(() => child.value.stdin?.write(line));
+    };
+    if (!child.ok)
+        queueMicrotask(() => end("start_failed"));
+    else {
+        const proc = child.value;
+        proc.on("error", () => end("start_failed"));
+        proc.on("close", () => end("exited"));
+        proc.stdin?.on("error", () => end("input_closed"));
+        proc.stdout?.on("data", (chunk) => {
+            state.buffer += chunk.toString();
+            const lines = state.buffer.split("\n");
+            state.buffer = lines.pop() ?? "";
+            for (const line of lines) {
+                const parsed = line.trim() ? parseJson(line) : null;
+                if (parsed?.ok)
+                    deliver(parsed.value);
+            }
+        });
+    }
+    return {
+        request: async (method, params) => {
+            const id = state.nextId++;
+            const reply = wait((m) => field(m, "id") === id);
+            write({ id, method, params });
+            const answered = await reply;
+            if (!answered.ok)
+                return answered;
+            const error = field(answered.value, "error");
+            if (error === undefined)
+                return ok(field(answered.value, "result"));
+            const message = field(error, "message");
+            return err({
+                kind: "rpc",
+                message: typeof message === "string" ? message : "unknown app-server error",
+            });
+        },
+        notify: (method, params) => write({ method, params }),
+        notification: async (method, matches) => {
+            const got = await wait((m) => field(m, "id") === undefined &&
+                field(m, "method") === method &&
+                matches(field(m, "params")));
+            return got.ok ? ok(field(got.value, "params")) : got;
+        },
+        close: () => {
+            if (state.ended)
+                return;
+            state.ended = { kind: "transport", reason: "exited" };
+            clearTimeout(timer);
+            if (child.ok)
+                child.value.kill();
+        },
+    };
+};
+const agentProcess = { runInteractive, startJsonRpc };
+export { agentProcess };
+//# sourceMappingURL=agent-process.js.map

package/dist/commands/takeover/_utils/agent-process.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-process.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/agent-process.ts"],"names":[],"mappings":"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"}

package/dist/commands/takeover/_utils/archive-codex-desktop-thread.js

@@ -1,63 +1,22 @@
-import { spawn } from "node:child_process";
-import { cliVersion } from "../../../_utils/version.js";
+import { cliVersion } from "../../../core/system/version.js";
+import { agentProcess } from "./agent-process.js";
 const CLEANUP_TIMEOUT_MS = 5_000;
-const archiveCodexDesktopThread = (input) => new Promise((resolve) => {
-    const child = spawn(input.binary, ["app-server"], {
-        stdio: ["pipe", "pipe", "ignore"],
+const archiveCodexDesktopThread = async (input) => {
+    const rpc = agentProcess.startJsonRpc(input.binary, ["app-server"], CLEANUP_TIMEOUT_MS);
+    const init = await rpc.request("initialize", {
+        clientInfo: { name: "glen", title: "Glen CLI", version: cliVersion },
+        capabilities: { experimentalApi: true },
     });
-    const state = { buffer: "", finished: false };
-    const finish = (archived = false) => {
-        if (state.finished)
-            return;
-        state.finished = true;
-        clearTimeout(timer);
-        child.kill();
-        resolve(archived);
-    };
-    const write = (message) => {
-        if (state.finished)
-            return;
-        child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", ...message })}\n`);
-    };
-    const timer = setTimeout(finish, CLEANUP_TIMEOUT_MS);
-    child.on("error", () => finish(false));
-    child.on("close", () => finish(false));
-    child.stdin.on("error", () => finish(false));
-    child.stdout.on("data", (chunk) => {
-        state.buffer += chunk.toString();
-        const lines = state.buffer.split("\n");
-        state.buffer = lines.pop() ?? "";
-        for (const line of lines) {
-            if (!line.trim())
-                continue;
-            const message = (() => {
-                try {
-                    return JSON.parse(line);
-                }
-                catch {
-                    return null;
-                }
-            })();
-            if (message?.id === 1) {
-                write({ method: "initialized", params: {} });
-                write({
-                    id: 2,
-                    method: "thread/archive",
-                    params: { threadId: input.threadId },
-                });
-            }
-            if (message?.id === 2)
-                finish(message.error === undefined);
-        }
+    if (!init.ok) {
+        rpc.close();
+        return false;
+    }
+    rpc.notify("initialized", {});
+    const archived = await rpc.request("thread/archive", {
+        threadId: input.threadId,
     });
-    queueMicrotask(() => write({
-        id: 1,
-        method: "initialize",
-        params: {
-            clientInfo: { name: "glen", title: "Glen CLI", version: cliVersion },
-            capabilities: { experimentalApi: true },
-        },
-    }));
-});
+    rpc.close();
+    return archived.ok;
+};
 export { archiveCodexDesktopThread };
 //# sourceMappingURL=archive-codex-desktop-thread.js.map