@sagentlab/navarch-runtime 0.1.90 → 0.1.91

package/dist/git-worktree.cjs

@@ -40,6 +40,7 @@ class GitWorktree {
     checkpointRoot;
     cloneUrl;
     githubToken;
+    workingBranch;
     repoLocalGithubToken;
     prContinuation;
     taskBranchSuffix;
@@ -78,6 +79,7 @@ class GitWorktree {
         this.sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
         this.cloneUrl = options.cloneUrl;
         this.githubToken = options.githubToken;
+        this.workingBranch = options.workingBranch?.trim() || null;
         this.repoLocalGithubToken = options.repoLocalGithubToken;
         this.prContinuation = options.prContinuation ?? false;
         this.hostedCheckpointRef = options.restoreHostedCheckpoint ? hostedCheckpointRef(options.taskId) : null;
@@ -517,6 +519,16 @@ class GitWorktree {
      * when the remote has no branches at all (a freshly provisioned empty repo).
      */
     async resolveStartRef() {
+        // The claim already merged the integration branch into the working branch,
+        // so it is the start (and delivery) base. A missing ref falls through to
+        // the default branch rather than starting the task on nothing.
+        if (this.workingBranch) {
+            const ref = `refs/remotes/origin/${this.workingBranch}`;
+            const found = await this.runGit(["--git-dir", this.repositoryPath, "rev-parse", "--verify", "--quiet", ref], false)
+                .then(() => true, () => false);
+            if (found)
+                return ref;
+        }
         const remoteHead = await this.runGit(["--git-dir", this.repositoryPath, "ls-remote", "--symref", "origin", "HEAD"], true);
         const defaultBranch = parseRemoteHead(remoteHead.stdout);
         if (defaultBranch)

package/dist/prompt.cjs

@@ -5,6 +5,12 @@ exports.renderGuidanceCorrectionPrompt = renderGuidanceCorrectionPrompt;
 exports.renderHostedCheckpointNote = renderHostedCheckpointNote;
 const CODE_GRAPH_GUIDANCE = "For JS/TS dependency inspection, the runtime provides `navarch-runtime code-graph --query <symbol-or-file> --mode search|callers|callees|impact --commit HEAD`. If the runtime is not on PATH, use its installed entry point; do not install another copy mid-task. Results describe committed source and include commit/freshness warnings; inspect current files for uncommitted changes and unresolved dependencies.";
 const PROCESS_GUIDANCE = "Process management: this host may run other agent sessions. Keep the PID or tool handle of each preview server you start and stop only that owned process. Never use broad process-name or command-line matching (pkill, killall) to clean up servers: the agent launcher carries the task prompt in its arguments and can match those patterns, terminating your own session. Use a different port when a port is occupied by a process you do not own. Keep scratch files in the current worktree; paths in previous transcripts belong to earlier sessions.";
+/** Overrides the playbooks' "default branch" PR base when the project sets a working branch. */
+function workingBranchNote(workingBranch) {
+    if (!workingBranch)
+        return "";
+    return `\nWorking branch: \`${workingBranch}\`. Your branch already starts from it. Open the pull request with \`--base ${workingBranch}\` instead of the default branch, and rebase onto \`origin/${workingBranch}\` when you need the latest base.`;
+}
 /**
  * Renders the four-layer context bundle (project-plan.md §3.8: steering docs,
  * task itself, task-type playbook, depends_on reports) into the single prompt
@@ -15,7 +21,8 @@ const PROCESS_GUIDANCE = "Process management: this host may run other agent sess
 function renderPrompt(task, bundle) {
     if (bundle.task_context) {
         const repositoryContext = bundle.repository
-            ? `Repository: ${bundle.repository.full_name} (${bundle.repository.url})\nLocal checkout: this session's isolated git worktree (current working directory).`
+            ? `Repository: ${bundle.repository.full_name} (${bundle.repository.url})\nLocal checkout: this session's isolated git worktree (current working directory).` +
+                workingBranchNote(bundle.repository.working_branch)
             : null;
         return [repositoryContext, PROCESS_GUIDANCE, bundle.task_context.trim(), CODE_GRAPH_GUIDANCE, bundle.retry_context?.trim()]
             .filter((section) => Boolean(section))
@@ -26,7 +33,8 @@ function renderPrompt(task, bundle) {
     sections.push(`Type: ${task.task_type} | Repo: ${task.repo} | Environment: ${task.environment_scope}`);
     sections.push(PROCESS_GUIDANCE);
     if (bundle.repository) {
-        sections.push(`Repository URL: ${bundle.repository.url}\nLocal checkout: this session's isolated git worktree (current working directory).`);
+        sections.push(`Repository URL: ${bundle.repository.url}\nLocal checkout: this session's isolated git worktree (current working directory).` +
+            workingBranchNote(bundle.repository.working_branch));
     }
     if (task.github_issue_url) {
         sections.push(`GitHub issue: ${task.github_issue_url}`);

package/dist/session.cjs

@@ -208,6 +208,7 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
         sessionId,
         cloneUrl,
         githubToken,
+        workingBranch: bundle.repository?.working_branch,
         repoLocalGithubToken: secrets["github-pat"],
         // Hosted runs skip checkpoints for verify tasks, which deliver a verdict.
         restoreHostedCheckpoint: !allowBranchRename && task.task_type !== "verify",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.90",
+  "version": "0.1.91",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",