orizu 0.5.37 → 0.5.38

package/dist/hosted-harvest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-harvest.d.ts","sourceRoot":"","sources":["../src/hosted-harvest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAaH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,iFAAiF;AACjF,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,iBAAiB,CAAA;AAExE,MAAM,WAAW,cAAc;IAC7B,iFAAiF;IACjF,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,0EAA0E;IAC1E,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAA;IACxB,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,0EAA0E;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACvC,kFAAkF;IAClF,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,qEAAqE;IACrE,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,GAC/D;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAElD,eAAO,MAAM,mCAAmC,0GAItC,CAAA;AAEV,eAAO,MAAM,iCAAiC,+EAGpC,CAAA;AAEV,eAAO,MAAM,+BAA+B;;;;CAgBlC,CAAA;AAUV,wBAAgB,4BAA4B,CAC1C,UAAU,GAAE,SAAS,MAAM,EAAwC,GAClE,MAAM,GAAG,IAAI,CAEf;AA6GD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAyJrE"}
+{"version":3,"file":"hosted-harvest.d.ts","sourceRoot":"","sources":["../src/hosted-harvest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAaH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,iFAAiF;AACjF,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,iBAAiB,CAAA;AAExE,MAAM,WAAW,cAAc;IAC7B,iFAAiF;IACjF,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,0EAA0E;IAC1E,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAA;IACxB,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,0EAA0E;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACvC,kFAAkF;IAClF,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,qEAAqE;IACrE,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,GAC/D;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAElD,eAAO,MAAM,mCAAmC,0GAItC,CAAA;AAEV,eAAO,MAAM,iCAAiC,+EAGpC,CAAA;AAEV,eAAO,MAAM,+BAA+B;;;;CAgBlC,CAAA;AAUV,wBAAgB,4BAA4B,CAC1C,UAAU,GAAE,SAAS,MAAM,EAAwC,GAClE,MAAM,GAAG,IAAI,CAEf;AA6GD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAmKrE"}

package/dist/hosted-harvest.js

@@ -235,10 +235,20 @@ export function harvestWorkspace(opts) {
         }
         const dirty = status.stdout.trim().length > 0;
         if (dirty) {
-            const add = exec(['add', '-A', '--', '.', ...excludeScaffold]);
+            // Add everything, then unstage the staged skill link. An exclude
+            // pathspec on add makes git exit 1 once bootstrap has ignored
+            // .claude/skills ("paths are ignored"), which is every hosted session
+            // (ORI-2441, git 2.49 in the sandbox). Only the link's own path is reset,
+            // so an agent's edits to a team's tracked skills next to it are saved;
+            // reset, unlike rm --cached, never deletes a tracked file.
+            const add = exec(['add', '-A', '--', '.']);
             if (add.exitCode !== 0) {
                 return { kind: 'work_persist_failed', error: `git add failed: ${detail(add)}` };
             }
+            const unstage = exec(['reset', '-q', '--', '.claude/skills/orizu']);
+            if (unstage.exitCode !== 0) {
+                return { kind: 'work_persist_failed', error: `git reset of .claude/skills/orizu failed: ${detail(unstage)}` };
+            }
             const commit = exec([
                 '-c',
                 `user.name=${opts.author.name}`,

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

@@ -15,7 +15,11 @@
  *       skill-installer; the local-sim rehearsal sets it),
  *   (2) `orizu skills path`      — the packaged vendor/skills/orizu of the
  *       globally-installed CLI (the production path),
- *   (3) `$(npm root -g)/orizu/vendor/skills/orizu` — belt fallback.
+ *   (3) `/opt/orizu/cli/vendor/skills/orizu` — the canonical copy the
+ *       published-package bake installs (ORI-2375: in a prebaked sandbox the
+ *       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.
@@ -55,8 +59,9 @@ export interface StageOrizuSkillResult {
     stdout: string;
     stderr: string;
 }
-/** The exact staging script — exported for tests that assert its shape. */
-export declare function renderStageOrizuSkillScript(workspaceDir: string): 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). */
+export declare function renderStageOrizuSkillScript(workspaceDir: string, canonicalSkillDir?: string): string;
 /**
  * Stage the orizu skill into `<workspaceDir>/.claude/skills/orizu`.
  * Non-throwing (except via the injected exec): resolves to a structured result

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;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;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;AAUD,2EAA2E;AAC3E,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAoBxE;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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"}

package/dist/hosted-skill-staging.js

@@ -15,7 +15,11 @@
  *       skill-installer; the local-sim rehearsal sets it),
  *   (2) `orizu skills path`      — the packaged vendor/skills/orizu of the
  *       globally-installed CLI (the production path),
- *   (3) `$(npm root -g)/orizu/vendor/skills/orizu` — belt fallback.
+ *   (3) `/opt/orizu/cli/vendor/skills/orizu` — the canonical copy the
+ *       published-package bake installs (ORI-2375: in a prebaked sandbox the
+ *       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.
@@ -32,8 +36,10 @@
 // non-traversal directory (both do: `<root>/repo` on the DO path, `repo` on the
 // operator path) — never an untrusted or user-supplied value.
 const SAFE_WORKSPACE_DIR = /^[A-Za-z0-9._/:@-]+$/;
-/** The exact staging script — exported for tests that assert its shape. */
-export function renderStageOrizuSkillScript(workspaceDir) {
+const CANONICAL_SKILL_DIR = '/opt/orizu/cli/vendor/skills/orizu';
+/** 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). */
+export function renderStageOrizuSkillScript(workspaceDir, canonicalSkillDir = CANONICAL_SKILL_DIR) {
     const skillsDir = `${workspaceDir}/.claude/skills`;
     return [
         `mkdir -p ${skillsDir}`,
@@ -48,6 +54,7 @@ export function renderStageOrizuSkillScript(workspaceDir) {
         `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`,
         `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"`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orizu",
-  "version": "0.5.37",
+  "version": "0.5.38",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",

package/src/hosted-harvest.ts

@@ -305,10 +305,20 @@ export function harvestWorkspace(opts: HarvestOptions): HarvestOutcome {
     const dirty = status.stdout.trim().length > 0
 
     if (dirty) {
-      const add = exec(['add', '-A', '--', '.', ...excludeScaffold])
+      // Add everything, then unstage the staged skill link. An exclude
+      // pathspec on add makes git exit 1 once bootstrap has ignored
+      // .claude/skills ("paths are ignored"), which is every hosted session
+      // (ORI-2441, git 2.49 in the sandbox). Only the link's own path is reset,
+      // so an agent's edits to a team's tracked skills next to it are saved;
+      // reset, unlike rm --cached, never deletes a tracked file.
+      const add = exec(['add', '-A', '--', '.'])
       if (add.exitCode !== 0) {
         return { kind: 'work_persist_failed', error: `git add failed: ${detail(add)}` }
       }
+      const unstage = exec(['reset', '-q', '--', '.claude/skills/orizu'])
+      if (unstage.exitCode !== 0) {
+        return { kind: 'work_persist_failed', error: `git reset of .claude/skills/orizu failed: ${detail(unstage)}` }
+      }
       const commit = exec([
         '-c',
         `user.name=${opts.author.name}`,

package/src/hosted-skill-staging.ts

@@ -15,7 +15,11 @@
  *       skill-installer; the local-sim rehearsal sets it),
  *   (2) `orizu skills path`      — the packaged vendor/skills/orizu of the
  *       globally-installed CLI (the production path),
- *   (3) `$(npm root -g)/orizu/vendor/skills/orizu` — belt fallback.
+ *   (3) `/opt/orizu/cli/vendor/skills/orizu` — the canonical copy the
+ *       published-package bake installs (ORI-2375: in a prebaked sandbox the
+ *       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.
@@ -68,8 +72,11 @@ export interface StageOrizuSkillResult {
 // operator path) — never an untrusted or user-supplied value.
 const SAFE_WORKSPACE_DIR = /^[A-Za-z0-9._/:@-]+$/
 
-/** The exact staging script — exported for tests that assert its shape. */
-export function renderStageOrizuSkillScript(workspaceDir: string): string {
+const CANONICAL_SKILL_DIR = '/opt/orizu/cli/vendor/skills/orizu'
+
+/** 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). */
+export function renderStageOrizuSkillScript(workspaceDir: string, canonicalSkillDir = CANONICAL_SKILL_DIR): string {
   const skillsDir = `${workspaceDir}/.claude/skills`
   return [
     `mkdir -p ${skillsDir}`,
@@ -84,6 +91,7 @@ export function renderStageOrizuSkillScript(workspaceDir: string): string {
     `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`,
     `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"`,