@aictiq/cli 0.3.0 → 0.4.1

package/dist/index.js

@@ -1603,12 +1603,30 @@ async function provisionLocal(run, checkout, options, env) {
       return false;
     }
   );
+  if (run.workOnDefaultBranch && !hasOrigin) {
+    throw new RunFailure(
+      "no-remote",
+      `${repo}, ${origin} ${run.projectKey}, has no origin remote to push ${run.branchName} to. Direct delivery needs one; add it with \`git remote add origin <url>\` or use branch-and-pull-request delivery.`
+    );
+  }
   let base = run.defaultBranch;
   if (hasOrigin) {
     options.event(`Fetching origin in ${repo}`);
     await call(["fetch", "origin"]);
     base = `origin/${run.defaultBranch}`;
   }
+  if (run.workOnDefaultBranch) {
+    await call(["clone", "--no-hardlinks", "--", repo, checkout]);
+    const isolated = (args) => gitStep(args, { cwd: checkout, env, signal: options.signal });
+    const remote = (await git(["remote", "get-url", "origin"], { cwd: repo, env })).trim();
+    const remoteUrl = isAbsolute(remote) || /^[A-Za-z][A-Za-z0-9+.-]*:/.test(remote) || /^[^/]+:/.test(remote) ? remote : resolve(repo, remote);
+    await isolated(["remote", "set-url", "origin", remoteUrl]);
+    await isolated(["fetch", "origin"]);
+    await isolated(["checkout", "-B", run.branchName, `origin/${run.branchName}`]);
+    await isolated(["branch", "--set-upstream-to", `origin/${run.branchName}`, run.branchName]);
+    options.event(`Created isolated clone ${checkout} on default branch ${run.branchName}`);
+    return null;
+  }
   const branchExists = await git(
     ["rev-parse", "--verify", "--quiet", `refs/heads/${run.branchName}`],
     {
@@ -1673,8 +1691,10 @@ async function provisionGithub(run, runDir, checkout, options, env) {
   );
   options.event(`Cloned ${full} (depth 50)`);
   const call = (args) => gitStep(args, { cwd: checkout, env, signal: options.signal }, token);
-  await call(["checkout", "-b", run.branchName]);
-  options.event(`Created branch ${run.branchName} from ${run.defaultBranch}`);
+  if (!run.workOnDefaultBranch) {
+    await call(["checkout", "-b", run.branchName]);
+    options.event(`Created branch ${run.branchName} from ${run.defaultBranch}`);
+  }
   await call(["config", "--local", "--replace-all", "credential.helper", ""]);
   await call(["config", "--local", "--add", "credential.helper", CREDENTIAL_HELPER]);
   return { [TOKEN_ENV]: token };
@@ -2202,7 +2222,9 @@ async function executeRun(run, options) {
       ...invocation.stdin === void 0 ? {} : { stdin: invocation.stdin },
       onLine: (stream, raw) => {
         const line = stripVTControlCharacters(raw);
-        for (const match of line.matchAll(PullRequestUrl)) pullRequestUrl = match[0];
+        if (!run.workOnDefaultBranch) {
+          for (const match of line.matchAll(PullRequestUrl)) pullRequestUrl = match[0];
+        }
         if (stream === "stderr") {
           log.push("stderr", line);
           remember(line);
@@ -2226,7 +2248,7 @@ async function executeRun(run, options) {
     const usage = { costUsd, inputTokens, outputTokens, exitCode };
     if (stopReason) return stopped(exitCode, lastLines, usage);
     const verdict = adapter.outcome(exitCode, lastLines, lastResult);
-    if (verdict.outcome === "succeeded" && !pullRequestUrl) {
+    if (verdict.outcome === "succeeded" && !run.workOnDefaultBranch && !pullRequestUrl) {
       pullRequestUrl = await (options.findPullRequest ?? findPullRequest)(
         workspace.checkout,
         run.branchName,