orizu 0.5.41 → 0.5.43

package/dist/hosted-session-seed.d.ts

@@ -8,11 +8,11 @@
  * a push of that `main` into the session copy. A Worker cannot run git, so
  * this is the first place in session start that can.
  *
- * It fills a copy only when the copy has no branches at all, which is what a
- * freshly created copy looks like. A retried or resumed boot finds `main` and
- * does nothing, so it never overwrites the agent's work, and a working
- * repository whose content lives on another branch is never touched. The
- * push is never forced; if another boot filled the copy first, that is fine.
+ * Team seeds leave populated copies alone. A selected session source is
+ * cloned even for a populated destination: its saved main must be an ancestor
+ * of destination main before boot may proceed. This preserves replacement
+ * commits while refusing a retry that contains only team files. Pushes are
+ * never forced. A lost push reply is accepted only after history readback.
  * Credentials come only through the `-c` settings the caller passes (the
  * boot's credential helper), never in a URL or argument.
  */
@@ -27,10 +27,12 @@ type SeedExec = (cmd: string, args: string[], opts?: {
 }) => SeedExecResult;
 export interface SeedSessionCopyInput {
     exec: SeedExec;
+    seedOrigin?: 'team' | 'session';
     sessionRemote: string;
     /** `git -c` settings that authenticate to the session copy. */
     sessionGitConfig: string[];
-    /** Called only when the copy is empty: the team copy and its `-c` settings. */
+    /** Server-selected origin and credentials; selected session origins must
+     * also be resolved on populated retries. The legacy name serves team boots. */
     resolveTeam: () => Promise<{
         remote: string;
         gitConfig: string[];
@@ -41,5 +43,43 @@ export interface SeedSessionCopyInput {
 export declare function seedSessionCopy(input: SeedSessionCopyInput): Promise<{
     seeded: boolean;
 }>;
+type SeedExecAsync = (cmd: string, args: string[], opts?: {
+    cwd?: string;
+}) => Promise<SeedExecResult>;
+export interface CloneTeamIntoWorkTreeInput {
+    exec: SeedExec;
+    /** Runs a command without blocking, so the check, the clone and the push
+     *  can overlap with each other and with the rest of the boot. */
+    execAsync: SeedExecAsync;
+    sessionRemote: string;
+    sessionGitConfig: string[];
+    resolveTeam: () => Promise<{
+        remote: string;
+        gitConfig: string[];
+    }>;
+    /** A path owned only by this clone; cleared before and after use. */
+    scratchDir: string;
+    /** The boot's working folder: absent or empty. */
+    workTree: string;
+}
+export type CloneTeamIntoWorkTreeResult = {
+    cloned: false;
+}
+/** `filled` settles once the background push into the session copy ends:
+ *  true when the copy now has main. It never rejects. */
+ | {
+    cloned: true;
+    filled: Promise<boolean>;
+};
+/**
+ * ORI-2512: a team boot of an empty session copy makes its working folder
+ * from ONE clone of the team copy, with the session copy as its push remote,
+ * and fills the session copy by pushing in the background. The session copy
+ * is checked at the same time as the clone; a copy that already has branches
+ * belongs to an earlier boot of this session, so the clone is dropped and the
+ * caller clones the session copy as usual. The clone keeps the whole history:
+ * an empty copy refuses a push from a shallow clone.
+ */
+export declare function cloneTeamIntoWorkTree(input: CloneTeamIntoWorkTreeInput): Promise<CloneTeamIntoWorkTreeResult>;
 export {};
 //# sourceMappingURL=hosted-session-seed.d.ts.map

package/dist/hosted-session-seed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-session-seed.d.ts","sourceRoot":"","sources":["../src/hosted-session-seed.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,eAAO,MAAM,yBAAyB,wDAAwD,CAAA;AAE9F,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AACD,KAAK,QAAQ,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,cAAc,CAAA;AAExF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAA;IACd,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,+EAA+E;IAC/E,WAAW,EAAE,MAAM,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACnE,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAA;CACnB;AAoBD,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAoB/F"}
+{"version":3,"file":"hosted-session-seed.d.ts","sourceRoot":"","sources":["../src/hosted-session-seed.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,eAAO,MAAM,yBAAyB,wDAAwD,CAAA;AAE9F,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AACD,KAAK,QAAQ,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,cAAc,CAAA;AAExF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B;mFAC+E;IAC/E,WAAW,EAAE,MAAM,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACnE,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAA;CACnB;AA2BD,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CA6B/F;AAED,KAAK,aAAa,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;AAEtG,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,QAAQ,CAAA;IACd;qEACiE;IACjE,SAAS,EAAE,aAAa,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,WAAW,EAAE,MAAM,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACnE,qEAAqE;IACrE,UAAU,EAAE,MAAM,CAAA;IAClB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,2BAA2B,GACnC;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE;AACnB;yDACyD;GACvD;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,CAAA;AAE9C;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAkDnH"}

package/dist/hosted-session-seed.js

@@ -8,11 +8,11 @@
  * a push of that `main` into the session copy. A Worker cannot run git, so
  * this is the first place in session start that can.
  *
- * It fills a copy only when the copy has no branches at all, which is what a
- * freshly created copy looks like. A retried or resumed boot finds `main` and
- * does nothing, so it never overwrites the agent's work, and a working
- * repository whose content lives on another branch is never touched. The
- * push is never forced; if another boot filled the copy first, that is fine.
+ * Team seeds leave populated copies alone. A selected session source is
+ * cloned even for a populated destination: its saved main must be an ancestor
+ * of destination main before boot may proceed. This preserves replacement
+ * commits while refusing a retry that contains only team files. Pushes are
+ * never forced. A lost push reply is accepted only after history readback.
  * Credentials come only through the `-c` settings the caller passes (the
  * boot's credential helper), never in a URL or argument.
  */
@@ -33,20 +33,37 @@ function sessionHasBranches(input) {
         throw failure('reading the session copy', listed);
     return listed.stdout.trim().length > 0;
 }
+function verifySourceSeedHistory(input) {
+    const fetched = input.exec('git', ['-C', input.scratchDir, ...withConfig(input.sessionGitConfig), 'fetch', '--quiet', input.sessionRemote, 'refs/heads/main:refs/seed/destination']);
+    if (fetched.status !== 0)
+        throw failure('reading destination saved history', fetched);
+    const ancestry = input.exec('git', ['-C', input.scratchDir, 'merge-base', '--is-ancestor', 'refs/heads/main', 'refs/seed/destination']);
+    if (ancestry.status !== 0)
+        throw new Error('destination does not contain the selected session saved history');
+}
 export async function seedSessionCopy(input) {
-    if (sessionHasBranches(input))
+    const hasBranches = sessionHasBranches(input);
+    if (hasBranches && input.seedOrigin !== 'session')
         return { seeded: false };
-    const team = await input.resolveTeam();
+    const origin = await input.resolveTeam();
     try {
         // A sandbox shutdown can interrupt clone before finally runs. This path
         // belongs only to seeding; never clear the surrounding session directory.
         const cleared = input.exec('rm', ['-rf', '--', input.scratchDir]);
         if (cleared.status !== 0)
             throw failure('clearing the seed scratch', cleared);
-        const fetched = input.exec('git', [...withConfig(team.gitConfig), 'clone', '--quiet', '--bare', '--single-branch', '--branch', 'main', team.remote, input.scratchDir]);
+        const fetched = input.exec('git', [...withConfig(origin.gitConfig), 'clone', '--quiet', '--bare', '--single-branch', '--branch', 'main', origin.remote, input.scratchDir]);
         if (fetched.status !== 0)
-            throw failure('reading the team copy', fetched);
+            throw failure(input.seedOrigin === 'session' ? 'reading selected saved files' : 'reading the team copy', fetched);
+        if (hasBranches) {
+            verifySourceSeedHistory(input);
+            return { seeded: false };
+        }
         const pushed = input.exec('git', ['-C', input.scratchDir, ...withConfig(input.sessionGitConfig), 'push', '--quiet', input.sessionRemote, 'refs/heads/main:refs/heads/main']);
+        if (input.seedOrigin === 'session') {
+            verifySourceSeedHistory(input);
+            return { seeded: pushed.status === 0 };
+        }
         if (pushed.status !== 0) {
             // Another boot of the same session may have filled it first.
             if (sessionHasBranches(input))
@@ -59,3 +76,72 @@ export async function seedSessionCopy(input) {
         input.exec('rm', ['-rf', '--', input.scratchDir]);
     }
 }
+/**
+ * ORI-2512: a team boot of an empty session copy makes its working folder
+ * from ONE clone of the team copy, with the session copy as its push remote,
+ * and fills the session copy by pushing in the background. The session copy
+ * is checked at the same time as the clone; a copy that already has branches
+ * belongs to an earlier boot of this session, so the clone is dropped and the
+ * caller clones the session copy as usual. The clone keeps the whole history:
+ * an empty copy refuses a push from a shallow clone.
+ */
+export async function cloneTeamIntoWorkTree(input) {
+    const clear = () => input.exec('rm', ['-rf', '--', input.scratchDir]);
+    const listing = input.execAsync('git', [...withConfig(input.sessionGitConfig), 'ls-remote', '--heads', input.sessionRemote]);
+    const cloning = (async () => {
+        const origin = await input.resolveTeam();
+        const cleared = clear();
+        if (cleared.status !== 0)
+            throw failure('clearing the seed scratch', cleared);
+        return input.execAsync('git', [...withConfig(origin.gitConfig), 'clone', '--quiet', '--single-branch', '--branch', 'main', origin.remote, input.scratchDir]);
+    })();
+    const settled = cloning.then(() => undefined, () => undefined);
+    let listed;
+    try {
+        listed = await listing;
+    }
+    catch (error) {
+        await settled;
+        clear();
+        throw error;
+    }
+    // A copy with saved work: answer now. The unneeded clone ends on its own
+    // and its scratch is cleared then.
+    if (listed.status === 0 && listed.stdout.trim().length > 0) {
+        void settled.then(clear);
+        return { cloned: false };
+    }
+    try {
+        const fetched = await cloning;
+        if (listed.status !== 0)
+            throw failure('reading the session copy', listed);
+        if (fetched.status !== 0)
+            throw failure('reading the team copy', fetched);
+        const pointed = input.exec('git', ['-C', input.scratchDir, 'remote', 'set-url', 'origin', input.sessionRemote]);
+        if (pointed.status !== 0)
+            throw failure('pointing the working folder at the session copy', pointed);
+        // The runtime image may ship the folder empty; `mv` needs it gone.
+        input.exec('rmdir', ['--', input.workTree]);
+        // A folder that is still there (not empty, or a mount point) would make
+        // `mv` put the clone inside it.
+        const remaining = input.exec('test', ['-e', input.workTree]);
+        if (remaining.status === 0)
+            throw failure('making the working folder', { status: 1, stdout: '', stderr: `${input.workTree} is not empty` });
+        const moved = input.exec('mv', ['--', input.scratchDir, input.workTree]);
+        if (moved.status !== 0)
+            throw failure('making the working folder', moved);
+    }
+    finally {
+        clear();
+    }
+    const filled = input.execAsync('git', ['-C', input.workTree, ...withConfig(input.sessionGitConfig), 'push', '--quiet', 'origin', 'refs/heads/main:refs/heads/main'])
+        .then(async (pushed) => {
+        if (pushed.status === 0)
+            return true;
+        // Another boot, or the agent's own first save, may have filled it first.
+        const listed = await input.execAsync('git', [...withConfig(input.sessionGitConfig), 'ls-remote', '--heads', input.sessionRemote]);
+        return listed.status === 0 && listed.stdout.trim().length > 0;
+    })
+        .catch(() => false);
+    return { cloned: true, filled };
+}

package/dist/hosted-skill-staging.d.ts

@@ -20,14 +20,18 @@
  *       sandbox user's npm prefix never holds the sudo-installed package),
  *   (4) `$(npm root -g)/orizu/vendor/skills/orizu` — for the non-prebaked
  *       bootstrap, which installs orizu globally and has no /opt/orizu/cli.
- * Then SYMLINK it under `<workspaceDir>/.claude/skills/orizu`, falling back to
- * a copy if the symlink cannot be created. Resolved paths stay in shell vars
- * (never interpolated), so they cannot inject into the command.
+ * Then SYMLINK it into each folder in ORIZU_SKILL_LINK_FOLDERS (ORI-2521:
+ * `.claude/skills/orizu` for Claude Code and opencode, `.agents/skills/orizu`
+ * for opencode, pi and Codex), falling back to a copy if a symlink cannot be
+ * created. Resolved paths stay in shell vars (never interpolated), so they
+ * cannot inject into the command.
  *
- * HARVEST-SAFE (ALI-1051): the script appends `/.claude/skills/` to the repo-LOCAL
- * `.git/info/exclude` so auto-harvest's `git add -A` cannot sweep the staged
- * symlink into the session branch (hosted-harvest.ts also excludes it by pathspec,
- * belt-and-braces).
+ * SAVE-SAFE (ALI-1051, ORI-2442): a skills folder may itself be a link, so the
+ * script resolves each folder's real location first. It appends the exact
+ * repo-relative path of each staged link to the repo-LOCAL `.git/info/exclude`
+ * (so the agent's own `git add -A` skips it) and records it in
+ * `.git/orizu/staged-skill-links`, which auto-save and `session finish --push`
+ * read to unstage the links (orizu-skill-links.ts).
  */
 export interface SkillStageExecResult {
     exitCode: number;
@@ -45,25 +49,44 @@ export interface StageOrizuSkillOptions {
     /**
      * Directory the session branch is cloned into (ABSOLUTE on the DO path,
      * sandbox-root RELATIVE on the operator path). The skill is staged under
-     * `<workspaceDir>/.claude/skills/orizu`.
+     * each of ORIZU_SKILL_LINK_FOLDERS.
      */
     workspaceDir: string;
     exec: SkillStageExec;
 }
+type SkillLinkStageMethod = 'symlink' | 'copy' | 'preserved' | 'same_folder';
+interface StagedSkillLink {
+    /** The link's real path, after resolving a linked skills folder. */
+    dest: string;
+    method: SkillLinkStageMethod | null;
+}
 export interface StageOrizuSkillResult {
+    /** Every folder was staged, preserved, or is the same real folder as an earlier one. */
     ok: boolean;
-    method: 'symlink' | 'copy' | 'preserved' | null;
+    /** The `.claude/skills` link's method; kept for the boot logs. */
+    method: SkillLinkStageMethod | null;
     /** `<workspaceDir>/.claude/skills/orizu`. */
     dest: string;
+    links: StagedSkillLink[];
     exitCode: number;
     stdout: string;
     stderr: string;
 }
 /** The exact staging script — exported for tests that assert its shape and run it
- *  (`canonicalSkillDir` lets a test lay the canonical copy out under a temp root). */
+ *  (`canonicalSkillDir` lets a test lay the canonical copy out under a temp root).
+ *
+ *  For each folder in ORIZU_SKILL_LINK_FOLDERS it prints one line:
+ *    SYMLINK <dest> <src> | COPY <dest> <src>   — staged
+ *    PRESERVED_TRACKED <dest>                  — the team tracks a valid skill there; left alone
+ *    PRESERVED_INVALID <dest>                  — the team tracks something there without SKILL.md
+ *    SAME_FOLDER <dest>                        — this folder is the same real folder as an earlier one
+ *    UNRESOLVED <dest>                         — the folder could not be created
+ *    OUTSIDE_REPO <dest>                       — the folder is a link out of the repo; skipped
+ *    INSIDE_GIT_DIR <dest>                     — the folder is a link into the git directory; skipped
+ *  or a single NO_SOURCE when no copy of the skill was found. */
 export declare function renderStageOrizuSkillScript(workspaceDir: string, canonicalSkillDir?: string): string;
 /**
- * Stage the orizu skill into `<workspaceDir>/.claude/skills/orizu`.
+ * Stage the orizu skill into each of ORIZU_SKILL_LINK_FOLDERS under `workspaceDir`.
  * Non-throwing (except via the injected exec): resolves to a structured result
  * both callers record their own way. A malformed `workspaceDir` returns a non-ok
  * result rather than throwing, so staging stays non-fatal to the boot.
@@ -72,7 +95,8 @@ export declare function renderStageOrizuSkillScript(workspaceDir: string, canoni
  * non-traversal directory. The shell-safety guard blocks injection metacharacters
  * but deliberately does not reject `..` or a leading `-` — do not pass untrusted
  * input here. Idempotent: safe to re-invoke (e.g. ALI-1060 resume/retry) — the
- * `.git/info/exclude` line is appended only when absent.
+ * `.git/info/exclude` and staged-links lines are appended only when absent.
  */
 export declare function stageOrizuSkill(opts: StageOrizuSkillOptions): Promise<StageOrizuSkillResult>;
+export {};
 //# sourceMappingURL=hosted-skill-staging.d.ts.map

package/dist/hosted-skill-staging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-skill-staging.d.ts","sourceRoot":"","sources":["../src/hosted-skill-staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE/E,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,CAAA;IAC/C,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAYD;sFACsF;AACtF,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,iBAAiB,SAAsB,GAAG,MAAM,CAqBjH;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAuBlG"}
+{"version":3,"file":"hosted-skill-staging.d.ts","sourceRoot":"","sources":["../src/hosted-skill-staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAIH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE/E,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,KAAK,oBAAoB,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,CAAA;AAE5E,UAAU,eAAe;IACvB,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAA;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,wFAAwF;IACxF,EAAE,EAAE,OAAO,CAAA;IACX,kEAAkE;IAClE,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACnC,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAmBD;;;;;;;;;;;iEAWiE;AACjE,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,iBAAiB,SAAsB,GAAG,MAAM,CAkDjH;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAkClG"}

package/dist/hosted-skill-staging.js

@@ -20,15 +20,20 @@
  *       sandbox user's npm prefix never holds the sudo-installed package),
  *   (4) `$(npm root -g)/orizu/vendor/skills/orizu` — for the non-prebaked
  *       bootstrap, which installs orizu globally and has no /opt/orizu/cli.
- * Then SYMLINK it under `<workspaceDir>/.claude/skills/orizu`, falling back to
- * a copy if the symlink cannot be created. Resolved paths stay in shell vars
- * (never interpolated), so they cannot inject into the command.
+ * Then SYMLINK it into each folder in ORIZU_SKILL_LINK_FOLDERS (ORI-2521:
+ * `.claude/skills/orizu` for Claude Code and opencode, `.agents/skills/orizu`
+ * for opencode, pi and Codex), falling back to a copy if a symlink cannot be
+ * created. Resolved paths stay in shell vars (never interpolated), so they
+ * cannot inject into the command.
  *
- * HARVEST-SAFE (ALI-1051): the script appends `/.claude/skills/` to the repo-LOCAL
- * `.git/info/exclude` so auto-harvest's `git add -A` cannot sweep the staged
- * symlink into the session branch (hosted-harvest.ts also excludes it by pathspec,
- * belt-and-braces).
+ * SAVE-SAFE (ALI-1051, ORI-2442): a skills folder may itself be a link, so the
+ * script resolves each folder's real location first. It appends the exact
+ * repo-relative path of each staged link to the repo-LOCAL `.git/info/exclude`
+ * (so the agent's own `git add -A` skips it) and records it in
+ * `.git/orizu/staged-skill-links`, which auto-save and `session finish --push`
+ * read to unstage the links (orizu-skill-links.ts).
  */
+import { ORIZU_SKILL_LINK_FOLDERS, STAGED_SKILL_LINKS_FILE } from './orizu-skill-links.js';
 // `workspaceDir` is interpolated into a shell command, so refuse anything a shell
 // could treat specially — the same allow-list hosted-bootstrap.ts asserts up front.
 // NOTE: this admits `..` traversal and a leading `-`; it is a shell-injection guard,
@@ -37,32 +42,77 @@
 // operator path) — never an untrusted or user-supplied value.
 const SAFE_WORKSPACE_DIR = /^[A-Za-z0-9._/:@-]+$/;
 const CANONICAL_SKILL_DIR = '/opt/orizu/cli/vendor/skills/orizu';
+const STATUS_METHODS = {
+    SYMLINK: 'symlink',
+    COPY: 'copy',
+    PRESERVED_TRACKED: 'preserved',
+    SAME_FOLDER: 'same_folder',
+};
 /** The exact staging script — exported for tests that assert its shape and run it
- *  (`canonicalSkillDir` lets a test lay the canonical copy out under a temp root). */
+ *  (`canonicalSkillDir` lets a test lay the canonical copy out under a temp root).
+ *
+ *  For each folder in ORIZU_SKILL_LINK_FOLDERS it prints one line:
+ *    SYMLINK <dest> <src> | COPY <dest> <src>   — staged
+ *    PRESERVED_TRACKED <dest>                  — the team tracks a valid skill there; left alone
+ *    PRESERVED_INVALID <dest>                  — the team tracks something there without SKILL.md
+ *    SAME_FOLDER <dest>                        — this folder is the same real folder as an earlier one
+ *    UNRESOLVED <dest>                         — the folder could not be created
+ *    OUTSIDE_REPO <dest>                       — the folder is a link out of the repo; skipped
+ *    INSIDE_GIT_DIR <dest>                     — the folder is a link into the git directory; skipped
+ *  or a single NO_SOURCE when no copy of the skill was found. */
 export function renderStageOrizuSkillScript(workspaceDir, canonicalSkillDir = CANONICAL_SKILL_DIR) {
-    const skillsDir = `${workspaceDir}/.claude/skills`;
     return [
-        `mkdir -p ${skillsDir}`,
-        // The staged skill is bootstrap-injected RUNTIME scaffolding (a symlink to the
-        // sandbox-local CLI vendor dir), NOT the agent's work. Exclude it repo-LOCALLY
-        // (.git/info/exclude — invisible to the diff, never committed) so auto-harvest's
-        // `git add -A` can't sweep it into the session branch and (ALI-1051) auto-apply
-        // a broken symlink to the customer's main. IDEMPOTENT (ALI-1060 resume/retry):
-        // only append when the line is absent, so a re-invocation never duplicates it.
-        `if [ -d ${workspaceDir}/.git ] && ! grep -qxF '/.claude/skills/' ${workspaceDir}/.git/info/exclude 2>/dev/null; then printf '%s\\n' '/.claude/skills/' >> ${workspaceDir}/.git/info/exclude; fi`,
-        `dest="${skillsDir}/orizu"`,
-        `if [ -d ${workspaceDir}/.git ] && git -C ${workspaceDir} ls-files -- '.claude/skills/orizu' '.claude/skills/orizu/**' | grep -q .; then if [ -f "$dest/SKILL.md" ]; then echo "PRESERVED_TRACKED $dest"; else echo "PRESERVED_INVALID $dest"; fi; exit 0; fi`,
+        `ws='${workspaceDir}'`,
+        `mkdir -p "$ws"`,
+        `root="$(cd "$ws" && pwd -P)" || exit 1`,
+        // Paths live in the git dir, never in the work tree. Both files are
+        // repo-local: `.git/info/exclude` hides each link from the agent's own
+        // `git add -A`, and the staged-links list tells the save steps where each
+        // link really landed (ORI-2442).
+        `gitdir="$(git -C "$ws" rev-parse --absolute-git-dir 2>/dev/null || true)"`,
+        `gitdir_p=''`,
+        `if [ -n "$gitdir" ]; then mkdir -p "$gitdir/info" "$(dirname "$gitdir/${STAGED_SKILL_LINKS_FILE}")"; gitdir_p="$(cd "$gitdir" && pwd -P)"; fi`,
+        // Sessions staged by an older CLI ignore the whole folder, which hides a
+        // team's new skills from saves; this script ignores exact link paths instead.
+        `if [ -n "$gitdir" ] && grep -qxF '/.claude/skills/' "$gitdir/info/exclude" 2>/dev/null; then grep -vxF '/.claude/skills/' "$gitdir/info/exclude" > "$gitdir/info/exclude.orizu-tmp"; mv "$gitdir/info/exclude.orizu-tmp" "$gitdir/info/exclude"; fi`,
         `src="${'${ORIZU_SKILL_SOURCE_DIR:-}'}"`,
         `if [ -z "$src" ] || [ ! -d "$src" ]; then src="$(orizu skills path 2>/dev/null || true)"; fi`,
         `if [ -z "$src" ] || [ ! -d "$src" ]; then src='${canonicalSkillDir}'; fi`,
         `if [ -z "$src" ] || [ ! -d "$src" ]; then r="$(npm root -g 2>/dev/null || true)"; if [ -n "$r" ] && [ -d "$r/orizu/vendor/skills/orizu" ]; then src="$r/orizu/vendor/skills/orizu"; fi; fi`,
-        `if [ -z "$src" ] || [ ! -d "$src" ]; then echo "NO_SOURCE"; exit 0; fi`,
-        `rm -rf "$dest"`,
-        `if ln -s "$src" "$dest" 2>/dev/null; then echo "SYMLINK $src"; else cp -R "$src" "$dest" && echo "COPY $src"; fi`,
+        `if [ -z "$src" ] || [ ! -d "$src" ]; then src=''; fi`,
+        `seen=' '`,
+        `nosource=''`,
+        `stage_one() {`,
+        `  mkdir -p "$ws/$1" 2>/dev/null`,
+        // Resolve the folder's REAL location: when it is itself a link, the skill
+        // link lands at the link's target (ORI-2442).
+        `  phys="$(cd "$ws/$1" 2>/dev/null && pwd -P)" || { echo "UNRESOLVED $ws/$1/orizu"; return; }`,
+        `  dest="$phys/orizu"`,
+        `  case "$seen" in *" $phys "*) echo "SAME_FOLDER $dest"; return;; esac`,
+        `  seen="$seen$phys "`,
+        // Never write outside the repo: a folder linked elsewhere is skipped, so
+        // the `rm -rf` below cannot reach another directory.
+        `  case "$phys" in "$root"/*) rel="\${phys#"$root"/}/orizu";; *) echo "OUTSIDE_REPO $dest"; return;; esac`,
+        `  if [ -n "$gitdir_p" ]; then case "$phys" in "$gitdir_p"|"$gitdir_p"/*) echo "INSIDE_GIT_DIR $dest"; return;; esac; fi`,
+        `  if [ -n "$gitdir" ] && git -C "$ws" ls-files -- "$rel" "$rel/**" | grep -q .; then if [ -f "$dest/SKILL.md" ]; then echo "PRESERVED_TRACKED $dest"; else echo "PRESERVED_INVALID $dest"; fi; return; fi`,
+        // IDEMPOTENT (ALI-1060 resume/retry): each line is appended only when absent.
+        `  if [ -n "$gitdir" ]; then`,
+        // Escape ignore-pattern characters so the line matches this exact path.
+        `    pat="/$(printf '%s' "$rel" | sed 's/[][*?\\\\]/\\\\&/g')"`,
+        `    grep -qxF "$pat" "$gitdir/info/exclude" 2>/dev/null || printf '%s\\n' "$pat" >> "$gitdir/info/exclude"`,
+        `    grep -qxF "$rel" "$gitdir/${STAGED_SKILL_LINKS_FILE}" 2>/dev/null || printf '%s\\n' "$rel" >> "$gitdir/${STAGED_SKILL_LINKS_FILE}"`,
+        `  fi`,
+        `  if [ -z "$src" ]; then nosource=1; return; fi`,
+        `  rm -rf "$dest"`,
+        `  if ln -s "$src" "$dest" 2>/dev/null; then echo "SYMLINK $dest $src"; else cp -R "$src" "$dest" && echo "COPY $dest $src"; fi`,
+        `}`,
+        ...ORIZU_SKILL_LINK_FOLDERS.map(folder => `stage_one '${folder}'`),
+        `if [ -n "$nosource" ]; then echo "NO_SOURCE"; fi`,
+        `exit 0`,
     ].join('\n');
 }
 /**
- * Stage the orizu skill into `<workspaceDir>/.claude/skills/orizu`.
+ * Stage the orizu skill into each of ORIZU_SKILL_LINK_FOLDERS under `workspaceDir`.
  * Non-throwing (except via the injected exec): resolves to a structured result
  * both callers record their own way. A malformed `workspaceDir` returns a non-ok
  * result rather than throwing, so staging stays non-fatal to the boot.
@@ -71,7 +121,7 @@ export function renderStageOrizuSkillScript(workspaceDir, canonicalSkillDir = CA
  * non-traversal directory. The shell-safety guard blocks injection metacharacters
  * but deliberately does not reject `..` or a leading `-` — do not pass untrusted
  * input here. Idempotent: safe to re-invoke (e.g. ALI-1060 resume/retry) — the
- * `.git/info/exclude` line is appended only when absent.
+ * `.git/info/exclude` and staged-links lines are appended only when absent.
  */
 export async function stageOrizuSkill(opts) {
     const dest = `${opts.workspaceDir}/.claude/skills/orizu`;
@@ -80,20 +130,32 @@ export async function stageOrizuSkill(opts) {
             ok: false,
             method: null,
             dest,
+            links: [],
             exitCode: 1,
             stdout: '',
             stderr: `unsafe workspaceDir — refusing to interpolate into a shell command: ${opts.workspaceDir}`,
         };
     }
     const result = await opts.exec(renderStageOrizuSkillScript(opts.workspaceDir));
-    const out = result.stdout.trim();
-    const method = out.startsWith('SYMLINK')
-        ? 'symlink'
-        : out.startsWith('COPY')
-            ? 'copy'
-            : out.startsWith('PRESERVED_TRACKED')
-                ? 'preserved'
-                : null;
-    const ok = result.exitCode === 0 && method !== null;
-    return { ok, method, dest, exitCode: result.exitCode, stdout: result.stdout, stderr: result.stderr };
+    const lines = result.stdout.split('\n').map(line => line.trim()).filter(Boolean);
+    const links = lines.flatMap((line) => {
+        const [status, linkDest] = line.split(' ');
+        if (!linkDest)
+            return [];
+        const method = STATUS_METHODS[status] ?? null;
+        return [{ dest: linkDest, method }];
+    });
+    const ok = result.exitCode === 0
+        && !lines.includes('NO_SOURCE')
+        && links.length === ORIZU_SKILL_LINK_FOLDERS.length
+        && links.every(link => link.method !== null);
+    return {
+        ok,
+        method: links[0]?.method ?? null,
+        dest,
+        links,
+        exitCode: result.exitCode,
+        stdout: result.stdout,
+        stderr: result.stderr,
+    };
 }

package/dist/http.d.ts

@@ -20,7 +20,8 @@ export type AuthenticatedRequestSource = 'ORIZU_TOKEN' | 'ORIZU_TOKEN_FILE' | 's
 export interface AuthenticatedRequestContext {
     readonly baseUrl: string;
     readonly source: AuthenticatedRequestSource;
-    fetch(path: string, init?: RequestInit): Promise<Response>;
+    /** `onRequestStart` runs just before each request goes out, as with `authedFetch`. */
+    fetch(path: string, init?: RequestInit, onRequestStart?: () => void): Promise<Response>;
     logout(signal?: AbortSignal | null): Promise<LogoutResult>;
 }
 export interface LogoutResult {

package/dist/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAWA,OAAO,EAAsC,WAAW,EAAoB,MAAM,mBAAmB,CAAA;AAerG,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAEtD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,WAAW,QAGhD;AAED,wBAAgB,cAAc,CAAC,KAAK,GAAE,WAA0B,GAAG,MAAM,CAiBxE;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAID,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAMnE;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,WAA0B,GAAG,WAAW,CAajF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,WAA0B,GAAG,MAAM,CAE7E;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAWD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,QAmBzD;AA+FD,wBAAgB,+BAA+B,IAAI,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAE/E;AAmGD,MAAM,MAAM,0BAA0B,GAAG,aAAa,GAAG,kBAAkB,GAAG,QAAQ,CAAA;AAEtF,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAA;IAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1D,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;CAC3D;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,sBAAsB,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAO,GACpE,2BAA2B,CAgI7B;AAID,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,IAAI,qBAqElG"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAWA,OAAO,EAAsC,WAAW,EAAoB,MAAM,mBAAmB,CAAA;AAerG,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAEtD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,WAAW,QAGhD;AAED,wBAAgB,cAAc,CAAC,KAAK,GAAE,WAA0B,GAAG,MAAM,CAiBxE;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAID,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAMnE;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,WAA0B,GAAG,WAAW,CAajF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,WAA0B,GAAG,MAAM,CAE7E;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAWD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,QAmBzD;AA+FD,wBAAgB,+BAA+B,IAAI,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAE/E;AAmGD,MAAM,MAAM,0BAA0B,GAAG,aAAa,GAAG,kBAAkB,GAAG,QAAQ,CAAA;AAEtF,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAA;IAC3C,sFAAsF;IACtF,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IACvF,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;CAC3D;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,sBAAsB,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAO,GACpE,2BAA2B,CAoI7B;AAID,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,IAAI,qBAqElG"}

package/dist/http.js

@@ -248,13 +248,15 @@ export function captureAuthenticatedRequestContext(options = {}) {
         return {
             baseUrl,
             source,
-            async fetch(path, init = {}) {
+            async fetch(path, init = {}, onRequestStart) {
+                const headers = {
+                    ...(init.headers || {}),
+                    Authorization: `Bearer ${resolveRequestBearer()}`,
+                };
+                onRequestStart?.();
                 return await fetch(`${baseUrl}${path}`, {
                     ...init,
-                    headers: {
-                        ...(init.headers || {}),
-                        Authorization: `Bearer ${resolveRequestBearer()}`,
-                    },
+                    headers,
                     ...credentialRequestRedirectPolicy(),
                 });
             },
@@ -279,7 +281,7 @@ export function captureAuthenticatedRequestContext(options = {}) {
     return {
         baseUrl,
         source: 'stored',
-        async fetch(path, init = {}) {
+        async fetch(path, init = {}, onRequestStart) {
             let didRefresh = false;
             if (allowRefresh
                 && isSessionCredentials(activeCredentials)
@@ -287,6 +289,7 @@ export function captureAuthenticatedRequestContext(options = {}) {
                 await refreshCapturedCredentials(init.signal);
                 didRefresh = true;
             }
+            onRequestStart?.();
             let response = await fetch(`${baseUrl}${path}`, {
                 ...init,
                 headers: {
@@ -300,6 +303,7 @@ export function captureAuthenticatedRequestContext(options = {}) {
                 && isSessionCredentials(activeCredentials)
                 && !didRefresh) {
                 await refreshCapturedCredentials(init.signal);
+                onRequestStart?.();
                 response = await fetch(`${baseUrl}${path}`, {
                     ...init,
                     headers: {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAwLA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAEhE,eAAO,MAAM,wBAAwB,GAAI,iBAAiB,MAAM;;;EACJ,CAAA;AAE5D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AA4tCtD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CA0B1G;AAED,eAAO,MAAM,iBAAiB,SAAU,CAAA;AACxC,eAAO,MAAM,uBAAuB,QAAkB,CAAA;AACtD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAexH;AAmMD,wBAAsB,IAAI,CAAC,OAAO,WAAwB,iBAiiBzD;AA6DD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAEhF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAwLA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAEhE,eAAO,MAAM,wBAAwB,GAAI,iBAAiB,MAAM;;;EACJ,CAAA;AAE5D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAwtCtD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CA0B1G;AAED,eAAO,MAAM,iBAAiB,SAAU,CAAA;AACxC,eAAO,MAAM,uBAAuB,QAAkB,CAAA;AACtD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAexH;AAmMD,wBAAsB,IAAI,CAAC,OAAO,WAAwB,iBAiiBzD;AA6DD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAEhF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/index.js

@@ -578,9 +578,13 @@ async function submitScoreResults() {
         console.warn(scoreInput.aggregateWarning);
     }
     const aggregatePayload = scoreInput.aggregate || {};
-    const response = await authedFetch(`/api/cli/scores/submit?project=${encodeURIComponent(project)}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+    const { sendScoreSave } = await import('./score-save-workflow.js');
+    const data = await sendScoreSave({
+        command: 'submit',
+        path: `/api/cli/scores/submit?project=${encodeURIComponent(project)}`,
+        project,
+        scorerVersionId,
+        saves: true,
         body: JSON.stringify({
             ...aggregatePayload,
             ...instructionSetProvenanceFields(project),
@@ -593,11 +597,7 @@ async function submitScoreResults() {
             candidateId: candidateId || undefined,
             resultsJsonl: scoreInput.resultsJsonl,
         }),
-    });
-    if (!response.ok) {
-        throw new Error(`Failed to submit score: ${await response.text()}`);
-    }
-    const data = await parseJsonResponse(response, 'Score submit');
+    }, authedFetch);
     if (hasJsonFlag()) {
         printJson(data);
         return;
@@ -706,9 +706,13 @@ async function execScorer() {
     }
     const instructionSetProvenance = instructionSetProvenanceFields(project);
     const isNoSubmit = hasArg('--no-submit');
-    const response = await authedFetch(`/api/cli/scorers/exec?project=${encodeURIComponent(project)}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+    const { sendScoreSave } = await import('./score-save-workflow.js');
+    const data = await sendScoreSave({
+        command: 'exec',
+        path: `/api/cli/scorers/exec?project=${encodeURIComponent(project)}`,
+        project,
+        scorerVersionId,
+        saves: !isNoSubmit,
         body: JSON.stringify({
             scorerVersionId,
             subjectPromptVersionId: subjectPromptVersionId || undefined,
@@ -724,11 +728,7 @@ async function execScorer() {
             dependencyResultsJsonl: readDependencyResultAssignments(getArg('--dependency-results')),
             ...instructionSetProvenance,
         }),
-    });
-    if (!response.ok) {
-        throw new Error(`Failed to execute scorer: ${await response.text()}`);
-    }
-    const data = await parseJsonResponse(response, 'Scorer exec');
+    }, authedFetch);
     const noSubmitOutput = isNoSubmit
         ? noSubmitScorerOutput(data, instructionSetProvenance)
         : null;