@rosthq/cli 0.7.37 → 0.7.38

package/dist/forge-workspace.d.ts

@@ -36,5 +36,25 @@ export declare function prepareForgeWorkspace(options: PrepareForgeWorkspaceOpti
 export declare function pushChangeset(ws: ForgeWorkspace, credential: ForgeCredential): Promise<{
     commitSha: string;
 } | null>;
+export type OpenDraftPullRequestOptions = {
+    repo: {
+        owner: string;
+        name: string;
+        default_branch: string;
+    };
+    branch: string;
+    buildRequestId: string;
+    commitSha: string;
+    credential: ForgeCredential;
+    apiBaseUrl?: string;
+    fetchImpl?: typeof fetch;
+};
+export type ForgePullRequest = {
+    url: string;
+    number: number;
+    draft: boolean;
+    adopted: boolean;
+};
+export declare function openDraftPullRequest(options: OpenDraftPullRequestOptions): Promise<ForgePullRequest>;
 export declare function removeWorkspace(ws: ForgeWorkspace): Promise<void>;
 //# sourceMappingURL=forge-workspace.d.ts.map

package/dist/forge-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forge-workspace.d.ts","sourceRoot":"","sources":["../src/forge-workspace.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,yBAAyB,gFAQ5B,CAAC;AAEX,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAW7E;AAID,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAG3B,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;IAGpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAKlB,OAAO,EAAE,MAAM,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEvD,MAAM,MAAM,4BAA4B,GAAG;IAEzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1D,OAAO,EAAE,qBAAqB,CAAC;IAE/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,UAAU,EAAE,eAAe,CAAC;IAI5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA+QF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,cAAc,CAAC,CAmC1G;AA8CD,wBAAsB,aAAa,CACjC,EAAE,EAAE,cAAc,EAClB,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BvC;AAiBD,wBAAsB,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAOvE"}
+{"version":3,"file":"forge-workspace.d.ts","sourceRoot":"","sources":["../src/forge-workspace.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,yBAAyB,gFAQ5B,CAAC;AAEX,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAW7E;AAID,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAG3B,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;IAGpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAKlB,OAAO,EAAE,MAAM,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEvD,MAAM,MAAM,4BAA4B,GAAG;IAEzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1D,OAAO,EAAE,qBAAqB,CAAC;IAE/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,UAAU,EAAE,eAAe,CAAC;IAI5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA+QF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,cAAc,CAAC,CAmC1G;AA8CD,wBAAsB,aAAa,CACjC,EAAE,EAAE,cAAc,EAClB,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BvC;AAcD,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAE9D,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,eAAe,CAAC;IAG5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAE7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IAGf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAoGF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkC1G;AAiBD,wBAAsB,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAOvE"}

package/dist/index.js

@@ -52046,6 +52046,125 @@ async function pushChangeset(ws, credential) {
   });
   return { commitSha: head2 };
 }
+var GITHUB_API_BASE_URL = "https://api.github.com";
+var PR_OPEN_RETRY_ATTEMPTS = 3;
+var PR_OPEN_RETRY_BASE_DELAY_MS = 500;
+function githubHeaders(credential) {
+  return {
+    accept: "application/vnd.github+json",
+    authorization: `Bearer ${credential.token}`,
+    "content-type": "application/json",
+    "x-github-api-version": "2022-11-28",
+    // GitHub requires a User-Agent; derived from the BRAND constants (never a literal brand
+    // string — ADR-0001) and carries no credential.
+    "user-agent": `${BRAND.name}-${RSF_ADDON_BRAND.shortName}`.replace(/\s+/g, "-")
+  };
+}
+function draftPrTitle(options) {
+  return `${RSF_ADDON_BRAND.shortName} build ${shortRequestId(options.buildRequestId)}`;
+}
+function draftPrBody(options) {
+  return [
+    `Draft PR opened by the ${BRAND.name} ${RSF_ADDON_BRAND.shortName} runner harness.`,
+    "",
+    `- Build request: ${options.buildRequestId}`,
+    `- Branch: ${options.branch}`,
+    `- Commit: ${options.commitSha}`,
+    "",
+    `The approved plan and task checklist are tracked on the ${RSF_ADDON_BRAND.shortName} build request above. This PR is a draft; the runner never merges.`
+  ].join("\n");
+}
+async function withGithubRetries(op, fn) {
+  let lastError;
+  for (let attempt = 1; attempt <= PR_OPEN_RETRY_ATTEMPTS; attempt += 1) {
+    try {
+      const response = await fn();
+      if ((response.status >= 500 || response.status === 429) && attempt < PR_OPEN_RETRY_ATTEMPTS) {
+        lastError = new Error(`${op} transient status ${response.status}`);
+        await sleep2(PR_OPEN_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
+        continue;
+      }
+      return response;
+    } catch (error51) {
+      lastError = error51;
+      if (attempt >= PR_OPEN_RETRY_ATTEMPTS) {
+        break;
+      }
+      await sleep2(PR_OPEN_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
+    }
+  }
+  throw new Error(`${op} exhausted retries: ${lastError instanceof Error ? redactSecrets(lastError.message) : redactSecrets(String(lastError))}`);
+}
+async function readErrorText(response) {
+  try {
+    return (await response.text()).slice(0, 1e3);
+  } catch {
+    return `status ${response.status}`;
+  }
+}
+function toForgePullRequest(json2, adopted) {
+  const record2 = json2 && typeof json2 === "object" && !Array.isArray(json2) ? json2 : {};
+  const url2 = typeof record2.html_url === "string" ? record2.html_url : "";
+  const number4 = typeof record2.number === "number" ? record2.number : Number.NaN;
+  const draft = typeof record2.draft === "boolean" ? record2.draft : true;
+  if (!url2 || !Number.isFinite(number4)) {
+    throw new Error("github pr response missing html_url or number");
+  }
+  return { url: url2, number: number4, draft, adopted };
+}
+async function adoptExistingPullRequest(baseUrl, fetchImpl, options) {
+  const { owner, name } = options.repo;
+  const head2 = `${owner}:${options.branch}`;
+  const response = await withGithubRetries(
+    "github pr list",
+    async () => fetchImpl(`${baseUrl}/repos/${owner}/${name}/pulls?state=open&head=${encodeURIComponent(head2)}`, {
+      method: "GET",
+      headers: githubHeaders(options.credential)
+    })
+  );
+  if (response.status !== 200) {
+    return null;
+  }
+  const list = await response.json();
+  if (!Array.isArray(list) || list.length === 0) {
+    return null;
+  }
+  return toForgePullRequest(list[0], true);
+}
+async function openDraftPullRequest(options) {
+  const baseUrl = (options.apiBaseUrl ?? GITHUB_API_BASE_URL).replace(/\/+$/, "");
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const { owner, name } = options.repo;
+  const created = await withGithubRetries(
+    "github pr create",
+    async () => fetchImpl(`${baseUrl}/repos/${owner}/${name}/pulls`, {
+      method: "POST",
+      headers: githubHeaders(options.credential),
+      body: JSON.stringify({
+        title: draftPrTitle(options),
+        head: options.branch,
+        base: options.repo.default_branch,
+        body: draftPrBody(options),
+        draft: true,
+        maintainer_can_modify: true
+      })
+    })
+  );
+  if (created.status === 201) {
+    return toForgePullRequest(await created.json(), false);
+  }
+  if (created.status === 422) {
+    const detail = await readErrorText(created);
+    if (/already exists/i.test(detail)) {
+      const existing = await adoptExistingPullRequest(baseUrl, fetchImpl, options);
+      if (existing) {
+        return existing;
+      }
+    }
+    throw new Error(`github pr create failed 422: ${redactSecrets(detail).slice(0, 500)}`);
+  }
+  throw new Error(`github pr create failed ${created.status}: ${redactSecrets(await readErrorText(created)).slice(0, 500)}`);
+}
 async function removeWorktree(baseRepo, worktreeDir) {
   try {
     await runGit(["worktree", "remove", "--force", worktreeDir], baseRepo);
@@ -52807,7 +52926,13 @@ async function executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtim
     status: result.ok ? "succeeded" : "failed",
     summary: result.summary,
     log_ref: input.logRef(id),
-    model: (turnRuntime ?? runtime) === "codex" ? "codex-cli" : "claude-cli"
+    model: (turnRuntime ?? runtime) === "codex" ? "codex-cli" : "claude-cli",
+    // Artifact-bearing result fields (T1.5) — only sent when the harness produced them, so
+    // the result route's `.strict()` schema still accepts a plain read-status report.
+    ...result.prUrl ? { pr_url: result.prUrl } : {},
+    ...result.branch ? { branch: result.branch } : {},
+    ...result.commitSha ? { commit_sha: result.commitSha } : {},
+    ...result.evidence && result.evidence.length > 0 ? { evidence: result.evidence } : {}
   }, state.runner_secret);
   if (reported.status !== 200) {
     throw new Error(`${claimedUnitLabel(input.kind)} result failed ${reported.status}: ${redactForLog(JSON.stringify(reported.json))}`);
@@ -52981,14 +53106,23 @@ async function prepareForgeTurn(ctx, workOrder, execution) {
     ],
     allowNetwork: ctx.config.sandboxAllowNetwork
   });
-  return { ok: true, prep: { workspace, credential: { token, expiresAt, canPush }, sandbox, repoDir: workspace.worktreeDir } };
+  return {
+    ok: true,
+    prep: {
+      workspace,
+      credential: { token, expiresAt, canPush },
+      sandbox,
+      repoDir: workspace.worktreeDir,
+      repo: { owner, name, default_branch: defaultBranch },
+      buildRequestId
+    }
+  };
 }
 async function finalizeForgeBuildPush(prep, result) {
+  const credential = { token: prep.credential.token, expiresAt: prep.credential.expiresAt };
+  let pushed;
   try {
-    const pushed = await pushChangeset(prep.workspace, { token: prep.credential.token, expiresAt: prep.credential.expiresAt });
-    const note = pushed ? `[forge] pushed ${pushed.commitSha} to ${prep.workspace.branch}` : "[forge] no changes to push";
-    return { ...result, summary: `${result.summary}
-${note}`.slice(0, 12e3) };
+    pushed = await pushChangeset(prep.workspace, credential);
   } catch (error51) {
     return {
       ...result,
@@ -52997,6 +53131,43 @@ ${note}`.slice(0, 12e3) };
 [forge] push failed: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}`.slice(0, 12e3)
     };
   }
+  if (!pushed) {
+    return { ...result, summary: `${result.summary}
+[forge] no changes to push`.slice(0, 12e3) };
+  }
+  try {
+    const pr = await openDraftPullRequest({
+      repo: prep.repo,
+      branch: prep.workspace.branch,
+      buildRequestId: prep.buildRequestId,
+      commitSha: pushed.commitSha,
+      credential
+    });
+    const evidence = [
+      { kind: "note", summary: `pushed ${pushed.commitSha} to ${prep.workspace.branch}`.slice(0, 500) },
+      { kind: "note", summary: `${pr.adopted ? "adopted existing" : "opened"} draft PR ${pr.url}`.slice(0, 500) }
+    ];
+    return {
+      ...result,
+      prUrl: pr.url,
+      branch: prep.workspace.branch,
+      commitSha: pushed.commitSha,
+      evidence,
+      summary: `${result.summary}
+[forge] pushed ${pushed.commitSha} to ${prep.workspace.branch}; ${pr.adopted ? "adopted" : "opened"} draft PR ${pr.url}`.slice(0, 12e3)
+    };
+  } catch (error51) {
+    return {
+      ...result,
+      ok: false,
+      // The branch reached GitHub but the draft PR did not — fail so the phase requeues
+      // rather than advancing a headless push. Re-entry re-pushes (no-op) and re-opens (adopt).
+      branch: prep.workspace.branch,
+      commitSha: pushed.commitSha,
+      summary: `${result.summary}
+[forge] pushed ${pushed.commitSha} to ${prep.workspace.branch}; draft PR open failed: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}`.slice(0, 12e3)
+    };
+  }
 }
 function buildTurnPrompt(input) {
   const { kind, workOrder, execution } = input;