@ipul-labs/forge 1.21.2 → 1.35.0

package/lib/bin/cli/serverClient.js

@@ -18,12 +18,16 @@ function baseUrl() {
     return `http://localhost:${port}/api/forge`;
 }
 function headers() {
-    const token = process.env.FORGE_TOKEN;
+    const token = cliToken();
     return {
         "Content-Type": "application/json",
         ...(token ? { Authorization: `Bearer ${token}` } : {}),
     };
 }
+/** Personal API token (FORGE_API_TOKEN) first; the FORGE_TOKEN service token is the fallback. */
+export function cliToken() {
+    return process.env.FORGE_API_TOKEN || process.env.FORGE_TOKEN || undefined;
+}
 export const SERVER_MODE = `${GREEN}●${RESET} ${DIM}server${RESET}`;
 export const LOCAL_MODE = `${YELLOW}●${RESET} ${DIM}local${RESET}`;
 export async function isServerAvailable() {
@@ -63,7 +67,6 @@ export async function getJson(path) {
  * is an async generator yielding parsed event objects.
  */
 export function streamJob(path, body = {}) {
-    const token = process.env.FORGE_TOKEN ?? "";
     let jobId = null;
     const events = (async function* () {
         const startRes = await fetch(`${baseUrl()}${path}`, {
@@ -77,8 +80,9 @@ export function streamJob(path, body = {}) {
         }
         const { jobId: id } = (await startRes.json());
         jobId = id;
-        const streamUrl = `${baseUrl()}/jobs/${id}/stream?token=${encodeURIComponent(token)}`;
-        const streamRes = await fetch(streamUrl);
+        // Tokens travel in the Authorization header only — never in URLs, which
+        // end up in proxy and server logs.
+        const streamRes = await fetch(`${baseUrl()}/jobs/${id}/stream`, { headers: headers() });
         if (!streamRes.ok)
             throw new Error(`Stream failed: ${streamRes.status}`);
         const reader = streamRes.body.getReader();

package/lib/bin/cli/serverClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverClient.js","sourceRoot":"","sources":["../../../bin/cli/serverClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,MAAM,GAAG,GAAG,SAAS,CAAC;AACtB,MAAM,KAAK,GAAG,SAAS,CAAC;AACxB,MAAM,KAAK,GAAG,UAAU,CAAC;AACzB,MAAM,MAAM,GAAG,UAAU,CAAC;AAE1B,SAAS,OAAO;IACf,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC;IACtC,OAAO,oBAAoB,IAAI,YAAY,CAAC;AAC7C,CAAC;AAED,SAAS,OAAO;IACf,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IACtC,OAAO;QACN,cAAc,EAAE,kBAAkB;QAClC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,KAAK,IAAI,KAAK,IAAI,GAAG,SAAS,KAAK,EAAE,CAAC;AACpE,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,MAAM,IAAI,KAAK,IAAI,GAAG,QAAQ,KAAK,EAAE,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACtC,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE;YAC9C,OAAO,EAAE,OAAO,EAAE;YAClB,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SACjC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,EAAE,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,OAAgC,EAAE;IAC9E,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE;QAC9C,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,OAAO,EAAE;QAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC1B,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAuB,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,mBAAmB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAY;IACzC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACvE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAuB,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,mBAAmB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,OAAgC,EAAE;IACzE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;IAC5C,IAAI,KAAK,GAAkB,IAAI,CAAC;IAEhC,MAAM,MAAM,GAAG,CAAC,KAAK,SAAS,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE;YACnD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,OAAO,EAAE;YAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAuB,CAAC;YAC5E,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,mBAAmB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsB,CAAC;QACnE,KAAK,GAAG,EAAE,CAAC;QAEX,MAAM,SAAS,GAAG,GAAG,OAAO,EAAE,SAAS,EAAE,iBAAiB,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QACtF,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAEzE,MAAM,MAAM,GAAG,SAAS,CAAC,IAAK,CAAC,SAAS,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAChB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAElD,IAAI,EAAU,CAAC;YACf,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gBACzC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5B,IAAI,CAAC;oBACJ,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAe,CAAC;oBAC3C,MAAM,GAAG,CAAC;oBACV,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW;wBAAE,OAAO;gBACrF,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACX,CAAC;QACF,CAAC;IACF,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,EAAE,IAAI,KAAK,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;AAClD,CAAC"}
+{"version":3,"file":"serverClient.js","sourceRoot":"","sources":["../../../bin/cli/serverClient.ts"],"names":[],"mappings":"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"}

package/lib/bin/cli/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../bin/cli/session.ts"],"names":[],"mappings":"AAgNA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,iBAQ9C;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,iBA+B3C"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../bin/cli/session.ts"],"names":[],"mappings":"AA+MA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,iBAQ9C;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,iBA+B3C"}

package/lib/bin/cli/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../bin/cli/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../bin/cli/session.ts"],"names":[],"mappings":"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"}

package/lib/bin/cli/sessionStore.d.ts

@@ -27,7 +27,7 @@ export declare const PHASES: Readonly<{
 }>;
 /**
  * Resolve the on-disk directory for a session. Repo is canonicalised so
- * "iplayulisten/web-app" and "gitlab:iplayulisten/web-app" map to the
+ * "my-group/my-app" and "gitlab:my-group/my-app" map to the
  * same folder.
  */
 export declare function sessionDir(repo: string, iid: number | string): string;

package/lib/bin/cli/sessionStore.js

@@ -34,7 +34,7 @@ function rootDir() {
 }
 /**
  * Resolve the on-disk directory for a session. Repo is canonicalised so
- * "iplayulisten/web-app" and "gitlab:iplayulisten/web-app" map to the
+ * "my-group/my-app" and "gitlab:my-group/my-app" map to the
  * same folder.
  */
 export function sessionDir(repo, iid) {
@@ -116,7 +116,7 @@ export async function listSessions() {
     for (const repoEntry of repoDirs) {
         if (!repoEntry.isDirectory())
             continue;
-        // Repos may be nested one level (e.g. "iplayulisten/web-app").
+        // Repos may be nested one level (e.g. "my-group/my-app").
         const repoLevel1 = path.join(root, repoEntry.name);
         const repoSubdirs = await safeReadDir(repoLevel1);
         for (const sub of repoSubdirs) {

package/lib/bin/cli/sessionStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessionStore.js","sourceRoot":"","sources":["../../../bin/cli/sessionStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAI7C,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;CAChB,CAAC,CAAC;AAEH,SAAS,OAAO;IACf,OAAO,CACN,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC/B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAC7C,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,GAAoB;IAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,GAAW;IACnC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,GAAoB,EAAE,QAAwB;IAC/F,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IAC7C,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,GAAoB;IACpE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;IAC/D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,GAAoB;IACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAY,EAAE,GAAoB,EAAE,OAA8B;IACnG,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,IAAI,GAAiB,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI;QAC1D,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC;QAChB,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,GAAG;KACd,CAAC;IACF,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IACnE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3F,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAY,EAAE,GAAoB,EAAE,GAAyC;IAC9G,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACrB,MAAM,EAAE,CAAC,UAAU,CAClB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,EAC/B,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,EAC/D,MAAM,CACN,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,GAAoB;IAC/D,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,MAAM,EAAE,CAAC,SAAS,CACjB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,EACvB,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,IAAI,EAC3C,MAAM,CACN,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO;IAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACpD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY;IACjC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,GAAG,GAAmB,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IACzC,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YAAE,SAAS;QACvC,+DAA+D;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,CAAC;QAClD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;gBAAE,SAAS;YACjC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAEtD,eAAe;YACf,4DAA4D;YAC5D,2DAA2D;YAC3D,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;gBACxD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CACjE,CAAC;gBACF,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChB,SAAS;YACV,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC;YACpD,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;gBACnC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;oBAAE,SAAS;gBACtC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBACxE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;oBAAE,SAAS;gBACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC/D,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;QACF,CAAC;IACF,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;IACzE,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,GAAW;IACrC,IAAI,CAAC;QACJ,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,GAAoB;IACpE,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;IAC7B,IAAI,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACtG,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC7B,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO;IAC9B,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAE,WAAW,EAAE,YAAY,EAA2E;IAChJ,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACtD,qEAAqE;QACrE,kEAAkE;QAClE,wCAAwC;QACxC,IAAI,YAAY;YAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;QAC7B,IAAI,IAAI;YAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;QACvD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;IACzC,CAAC;IACD,OAAO,MAAM,OAAO,EAAE,CAAC;AACxB,CAAC"}
+{"version":3,"file":"sessionStore.js","sourceRoot":"","sources":["../../../bin/cli/sessionStore.ts"],"names":[],"mappings":"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"}

package/lib/bin/cli/ship.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../../bin/cli/ship.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AA+tBH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,iBAkC3C"}
+{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../../bin/cli/ship.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAkuBH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,iBAkC3C"}

package/lib/bin/cli/ship.js

@@ -29,20 +29,11 @@
  * `--yes` (or FORGE_YES=1) bypasses every gate. Resumable: re-running
  * `ship <iid>` reads session.phase and starts from the next gate.
  */
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
-import path from "node:path";
 import { useEffect, useState } from "react";
 import Spinner from "ink-spinner";
 import TextInput from "ink-text-input";
 import { h, Box, Text, useApp, runApp, Confirm } from "./ink.js";
-import { canonicalRepoId, projectRoot, resolveRepoSet } from "./utils.js";
+import { canonicalRepoId, resolveRepoSet } from "./utils.js";
 import { PHASES, appendEvent, readAnalysis, readState, setHead, updateState, writeAnalysis, } from "./sessionStore.js";
 const POLL_MS = 5000;
 const TERMINAL_PIPELINE = new Set([
@@ -186,7 +177,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         pushStep("Analyzing issue", `#${iid}`);
         (async () => {
             try {
-                const { ForgeAgent } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/ForgeAgent.ts")));
+                const { ForgeAgent } = await import("../../server/forge/core/ForgeAgent.js");
                 const agent = new ForgeAgent({
                     project: primary,
                     secondaryProjects: secondaries,
@@ -238,7 +229,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         pushStep("Refining with feedback", feedback);
         (async () => {
             try {
-                const { ForgeAgent } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/ForgeAgent.ts")));
+                const { ForgeAgent } = await import("../../server/forge/core/ForgeAgent.js");
                 const agent = new ForgeAgent({
                     project: primary,
                     secondaryProjects: secondaries,
@@ -248,7 +239,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
                     if (evt.type === "result")
                         final = evt.data;
                 };
-                await agent.refineIssue(iid, analysis.changes, feedback, onEvent, undefined);
+                await agent.refineIssue(iid, analysis.changes, feedback, onEvent, undefined, undefined, null, null);
                 if (cancelled)
                     return;
                 if (!final)
@@ -284,7 +275,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         pushStep("Validating proposal", "lint / typecheck / test");
         (async () => {
             try {
-                const { validate } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/validator.ts")));
+                const { validate } = await import("../../server/forge/core/validator.js");
                 const res = await validate(analysis, () => { });
                 if (cancelled)
                     return;
@@ -321,7 +312,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         pushStep("Opening MR", "branch + commit + create MR");
         (async () => {
             try {
-                const { ForgeAgent } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/ForgeAgent.ts")));
+                const { ForgeAgent } = await import("../../server/forge/core/ForgeAgent.js");
                 const agent = new ForgeAgent({
                     project: primary,
                     secondaryProjects: secondaries,
@@ -374,7 +365,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
                 const state = await readState(repo, iid);
                 if (!state?.mrIid)
                     throw new Error("session has no mrIid; cannot watch");
-                const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
+                const { createProvider } = await import("../../server/forge/core/providers/index.js");
                 const provider = createProvider(primary);
                 const poll = async () => {
                     if (cancelled)
@@ -439,7 +430,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         (async () => {
             try {
                 const state = await readState(repo, iid);
-                const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
+                const { createProvider } = await import("../../server/forge/core/providers/index.js");
                 const provider = createProvider(primary);
                 const pipelines = await provider.getMRPipelines(state.mrIid);
                 const latest = pipelines?.[0];
@@ -455,7 +446,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
                     return `### ${j.stage}/${j.name}\n\n\`\`\`\n${tail}\n\`\`\``;
                 }));
                 const ciContext = traces.join("\n\n");
-                const { ForgeAgent } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/ForgeAgent.ts")));
+                const { ForgeAgent } = await import("../../server/forge/core/ForgeAgent.js");
                 const agent = new ForgeAgent({
                     project: primary,
                     secondaryProjects: secondaries,
@@ -465,7 +456,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
                     if (evt.type === "result")
                         final = evt.data;
                 };
-                await agent.ciFixIssue(iid, ciContext, onEvent);
+                await agent.ciFixIssue(iid, ciContext, onEvent, undefined);
                 if (cancelled)
                     return;
                 if (!final)
@@ -499,10 +490,11 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         (async () => {
             try {
                 const state = await readState(repo, iid);
-                const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
+                const { createProvider } = await import("../../server/forge/core/providers/index.js");
+                const { supportsAutoMerge } = await import("../../server/forge/core/providers/base.js");
                 const provider = createProvider(primary);
                 if (autoMerge) {
-                    if (typeof provider.setAutoMergeMR !== "function")
+                    if (!supportsAutoMerge(provider))
                         throw new Error("provider does not support auto-merge");
                     await provider.setAutoMergeMR(state.mrIid);
                 }
@@ -546,7 +538,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         let timer;
         (async () => {
             try {
-                const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
+                const { createProvider } = await import("../../server/forge/core/providers/index.js");
                 const provider = createProvider(primary);
                 const target = process.env.GITLAB_BASE_BRANCH ??
                     process.env.GITHUB_BASE_BRANCH ??
@@ -605,7 +597,7 @@ function ShipView({ iid, primary, secondaries, bypassYes, autoMerge, skipValidat
         pushStep("Closing issue", `#${iid}`);
         (async () => {
             try {
-                const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
+                const { createProvider } = await import("../../server/forge/core/providers/index.js");
                 const provider = createProvider(primary);
                 await provider.closeIssue(iid);
                 if (cancelled)

package/lib/bin/cli/ship.js.map

@@ -1 +1 @@
-{"version":3,"file":"ship.js","sourceRoot":"","sources":["../../../bin/cli/ship.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ship.js","sourceRoot":"","sources":["../../../bin/cli/ship.ts"],"names":[],"mappings":"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"}

package/lib/bin/cli/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../bin/cli/update.ts"],"names":[],"mappings":"AAwGA,wBAAsB,SAAS,kBAM9B"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../bin/cli/update.ts"],"names":[],"mappings":"AA+GA,wBAAsB,SAAS,kBAM9B"}

package/lib/bin/cli/update.js

@@ -1,11 +1,24 @@
-import { execSync } from "node:child_process";
+import { execFileSync, execSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import path from "node:path";
 import { useEffect, useState } from "react";
 import Spinner from "ink-spinner";
 import { h, Box, Text, useApp, runApp } from "./ink.js";
+import { planUpdate } from "./updatePlan.js";
 import { projectRoot, readPkg } from "./utils.js";
-function UpdateView({ onDone }) {
+const CHECKING_LABEL = "Checking for updates…";
+function currentPlan() {
+    const globalRoot = execSync("npm root --global", { encoding: "utf8" }).trim();
+    return planUpdate({ packageRoot: projectRoot, hasGit: existsSync(path.join(projectRoot, ".git")), globalRoot });
+}
+/** Version on disk after the steps ran (a global reinstall replaces this folder). */
+async function installedVersion() {
+    return (await readPkg()).version;
+}
+function UpdateView({ plan, onDone }) {
     const { exit } = useApp();
     const [phase, setPhase] = useState("checking");
+    const [label, setLabel] = useState(CHECKING_LABEL);
     const [info, setInfo] = useState({});
     const [error, setError] = useState(null);
     useEffect(() => {
@@ -17,44 +30,37 @@ function UpdateView({ onDone }) {
     useEffect(() => {
         (async () => {
             try {
-                const before = (await readPkg()).version;
-                setInfo((prev) => ({ ...prev, before }));
-                setPhase("pulling");
-                execSync("git pull --rebase", { cwd: projectRoot, stdio: "pipe" });
-                setPhase("installing");
-                execSync("npm install --no-audit --no-fund", {
-                    cwd: projectRoot,
-                    stdio: "pipe",
-                });
-                const after = (await readPkg()).version;
+                const before = await installedVersion();
+                if (plan.kind === "message") {
+                    setInfo({ before, after: before, updated: false, note: plan.text });
+                    setPhase("done");
+                    return;
+                }
+                setPhase("running");
+                for (const step of plan.steps) {
+                    setLabel(step.label);
+                    execFileSync(step.cmd, step.args, { cwd: step.cwd, stdio: "pipe" });
+                }
+                const after = await installedVersion();
                 setInfo({ before, after, updated: before !== after });
                 setPhase("done");
             }
             catch (err) {
-                setError(err);
+                setError(err instanceof Error ? err : new Error(String(err)));
                 setPhase("error");
             }
         })();
     }, []);
-    if (phase === "checking") {
-        return h `<${Box}>
-			<${Text} color="cyan"><${Spinner} type="dots"/></>
-			<${Text}> Checking for updates…</>
-		</>`;
-    }
-    if (phase === "pulling") {
+    if (phase === "checking" || phase === "running") {
         return h `<${Box}>
 			<${Text} color="cyan"><${Spinner} type="dots"/></>
-			<${Text}> Pulling latest changes…</>
-		</>`;
-    }
-    if (phase === "installing") {
-        return h `<${Box}>
-			<${Text} color="cyan"><${Spinner} type="dots"/></>
-			<${Text}> Installing dependencies…</>
+			<${Text}> ${label}</>
 		</>`;
     }
     if (phase === "done") {
+        if (info.note) {
+            return h `<${Box}><${Text}>${info.note}</></>`;
+        }
         if (info.updated) {
             return h `<${Box} flexDirection="column">
 				<${Box}>
@@ -80,7 +86,7 @@ function UpdateView({ onDone }) {
 }
 export async function cmdUpdate() {
     let outcome = { phase: "pending", info: {}, error: null };
-    await runApp(h `<${UpdateView} onDone=${(o) => (outcome = o)} />`);
+    await runApp(h `<${UpdateView} plan=${currentPlan()} onDone=${(o) => (outcome = o)} />`);
     if (outcome.phase === "error")
         process.exit(2);
 }

package/lib/bin/cli/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../bin/cli/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../bin/cli/update.ts"],"names":[],"mappings":"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"}

package/lib/bin/cli/updatePlan.d.ts

@@ -0,0 +1,30 @@
+export declare const PACKAGE_NAME = "@ipul-labs/forge";
+export interface UpdateStep {
+    cmd: string;
+    args: string[];
+    cwd: string;
+    label: string;
+}
+export type UpdatePlan = {
+    kind: "steps";
+    steps: UpdateStep[];
+} | {
+    kind: "message";
+    text: string;
+};
+interface PlanInput {
+    /** Folder holding Forge's package.json. */
+    packageRoot: string;
+    /** Whether packageRoot is a git checkout (a clone, not an npm install). */
+    hasGit: boolean;
+    /** `npm root --global`. */
+    globalRoot: string;
+}
+/**
+ * How `forge update` brings this copy up to date. A clone pulls; an npm
+ * install reinstalls the latest release where it was installed. The source
+ * repo is private, so an installed copy must never reach for git.
+ */
+export declare function planUpdate({ packageRoot, hasGit, globalRoot }: PlanInput): UpdatePlan;
+export {};
+//# sourceMappingURL=updatePlan.d.ts.map

package/lib/bin/cli/updatePlan.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updatePlan.d.ts","sourceRoot":"","sources":["../../../bin/cli/updatePlan.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,qBAAqB,CAAC;AAO/C,MAAM,WAAW,UAAU;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpG,UAAU,SAAS;IAClB,2CAA2C;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,MAAM,EAAE,OAAO,CAAC;IAChB,2BAA2B;IAC3B,UAAU,EAAE,MAAM,CAAC;CACnB;AASD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,UAAU,CA+BrF"}