@jskit-ai/jskit-cli 0.2.80 → 0.2.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/jskit-cli",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "Bundle and package orchestration CLI for JSKIT apps.",
   "type": "module",
   "files": [
@@ -20,9 +20,9 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@jskit-ai/jskit-catalog": "0.1.79",
-    "@jskit-ai/kernel": "0.1.71",
-    "@jskit-ai/shell-web": "0.1.70"
+    "@jskit-ai/jskit-catalog": "0.1.80",
+    "@jskit-ai/kernel": "0.1.72",
+    "@jskit-ai/shell-web": "0.1.71"
   },
   "engines": {
     "node": ">=20 <23"

package/src/server/commandHandlers/session.js

@@ -4,6 +4,7 @@ import {
   adoptCodexThreadId,
   buildSessionErrorResponse,
   createSession,
+  inspectSessionDiff,
   inspectSessionDetails,
   listSessions,
   runSessionStep
@@ -52,6 +53,17 @@ function writeSessionText(stdout, payload) {
     stdout.write(payload.prompt);
     stdout.write("\n");
   }
+  if (payload.gitStatus !== undefined && payload.unstagedDiff !== undefined) {
+    stdout.write("\nGit status:\n");
+    stdout.write(payload.gitStatus || "No changes.");
+    stdout.write("\n");
+    const diff = [payload.stagedDiff, payload.unstagedDiff, payload.untrackedDiff].filter(Boolean).join("\n");
+    if (diff) {
+      stdout.write("\nDiff:\n");
+      stdout.write(diff);
+      stdout.write("\n");
+    }
+  }
   if (payload.errors?.length) {
     stdout.write("Errors:\n");
     for (const error of payload.errors) {
@@ -135,6 +147,21 @@ async function resolveStepInputs({
   cwd,
   sessionId
 }) {
+  const issueTitle = await resolveTextInput({
+    codePrefix: "issue_title",
+    fileOption: "issue-title-file",
+    inlineOptions,
+    io,
+    repairCommand: `jskit session ${sessionId} step --issue-title "<title>" --issue -`,
+    cwd,
+    sessionId,
+    stdinOption: "-",
+    textOption: "issue-title"
+  });
+  if (issueTitle.ok === false) {
+    return issueTitle;
+  }
+
   const issue = await resolveTextInput({
     codePrefix: "issue",
     fileOption: "issue-file",
@@ -150,9 +177,26 @@ async function resolveStepInputs({
     return issue;
   }
 
+  const plan = await resolveTextInput({
+    codePrefix: "plan",
+    fileOption: "plan-file",
+    inlineOptions,
+    io,
+    repairCommand: `jskit session ${sessionId} step --plan -`,
+    cwd,
+    sessionId,
+    stdinOption: "-",
+    textOption: "plan"
+  });
+  if (plan.ok === false) {
+    return plan;
+  }
+
   return {
     issue: issue.value,
-    ok: true
+    issueTitle: issueTitle.value,
+    ok: true,
+    plan: plan.value
   };
 }
 
@@ -164,6 +208,20 @@ function normalizeStepOptions(inlineOptions = {}) {
   };
 }
 
+function resolveListArchiveOption(options = {}) {
+  const archives = [];
+  if (options.abandoned) {
+    archives.push("abandoned");
+  }
+  if (options.completed) {
+    archives.push("completed");
+  }
+  if (options.all) {
+    archives.push("all");
+  }
+  return archives.length > 0 ? archives : "active";
+}
+
 function createSessionCommands() {
   return {
     async commandSession({
@@ -178,7 +236,10 @@ function createSessionCommands() {
       let payload;
 
       if (!first) {
-        payload = await listSessions({ targetRoot: cwd });
+        payload = await listSessions({
+          targetRoot: cwd,
+          archive: resolveListArchiveOption(options)
+        });
       } else if (first === "create") {
         payload = await createSession({ targetRoot: cwd });
       } else if (second === "step") {
@@ -195,7 +256,9 @@ function createSessionCommands() {
               sessionId: first,
               options: {
                 ...normalizeStepOptions(inlineOptions),
-                issue: stepInputs.issue
+                issue: stepInputs.issue,
+                issueTitle: stepInputs.issueTitle,
+                plan: stepInputs.plan
               }
             });
       } else if (second === "abandon") {
@@ -203,6 +266,11 @@ function createSessionCommands() {
           targetRoot: cwd,
           sessionId: first
         });
+      } else if (second === "diff") {
+        payload = await inspectSessionDiff({
+          targetRoot: cwd,
+          sessionId: first
+        });
       } else if (second === "adopt-codex-thread") {
         payload = await adoptCodexThreadId({
           targetRoot: cwd,

package/src/server/core/argParser.js

@@ -23,6 +23,8 @@ function parseArgs(argv, { createCliError } = {}) {
         verbose: false,
         json: false,
         all: false,
+        abandoned: false,
+        completed: false,
         concrete: false,
         help: true,
         inlineOptions: {}
@@ -50,6 +52,8 @@ function parseArgs(argv, { createCliError } = {}) {
     verbose: false,
     json: false,
     all: false,
+    abandoned: false,
+    completed: false,
     concrete: false,
     help: false,
     inlineOptions: {}
@@ -109,6 +113,14 @@ function parseArgs(argv, { createCliError } = {}) {
       options.all = true;
       continue;
     }
+    if (token === "--abandoned") {
+      options.abandoned = true;
+      continue;
+    }
+    if (token === "--completed") {
+      options.completed = true;
+      continue;
+    }
     if (token === "--concrete") {
       options.concrete = true;
       continue;

package/src/server/core/commandCatalog.js

@@ -9,7 +9,9 @@ const OPTION_FLAG_LABELS = Object.freeze({
   checkDiLabels: "--check-di-labels",
   verbose: "--verbose",
   json: "--json",
-  all: "--all"
+  all: "--all",
+  abandoned: "--abandoned",
+  completed: "--completed"
 });
 
 const PARSED_BOOLEAN_OPTION_KEYS = Object.freeze(Object.keys(OPTION_FLAG_LABELS));
@@ -211,15 +213,18 @@ const COMMAND_DESCRIPTORS = Object.freeze({
       }),
       Object.freeze({
         name: "[step|abandon|adopt-codex-thread]",
-        description: "Run the next step, abandon a session, or attach a Codex thread id."
+        description: "Run the next step, inspect a diff, abandon a session, or attach a Codex thread id."
       })
     ]),
     defaults: Object.freeze([
       "Active session state lives in .jskit/sessions/active/<session_id> under the current target app.",
-      "Session worktrees live in .jskit/sessions/worktrees/<session_id>.",
+      "Session worktrees live in .jskit/sessions/active/<session_id>/worktree.",
       "The session id is timestamp-based and is the primary key.",
+      "Bare list output includes active sessions only; use --abandoned, --completed, or --all for archived sessions.",
       "Use --json for the stable machine-readable contract consumed by JSKIT AI Studio.",
-      "Use --issue - to read approved issue text from stdin."
+      "Use --issue - to read approved issue body from stdin.",
+      "Use --issue-title when the approved issue title is separate from the body.",
+      "Use --plan - to read the approved implementation plan from stdin."
     ]),
     examples: Object.freeze([
       Object.freeze({
@@ -228,15 +233,17 @@ const COMMAND_DESCRIPTORS = Object.freeze({
           "jskit session create",
           "jskit session 2026-05-11_21-42-08 step",
           "jskit session 2026-05-11_21-42-08 step --prompt \"Fix the customer filters\"",
-          "jskit session 2026-05-11_21-42-08 step --issue -"
+          "jskit session 2026-05-11_21-42-08 step --issue-title \"Fix customer filters\" --issue -",
+          "jskit session 2026-05-11_21-42-08 step --plan -",
+          "jskit session 2026-05-11_21-42-08 diff --json"
         ])
       })
     ]),
     fullUse:
-      "jskit session [create|<sessionId>] [step|abandon|adopt-codex-thread] [--prompt <text>] [--issue <text>|--issue-file <path>] [--user-check <passed|failed>] [--codex-thread-id <id>] [--json]",
+      "jskit session [create|<sessionId>] [step|diff|abandon|adopt-codex-thread] [--prompt <text>] [--issue-title <text>|--issue-title-file <path>] [--issue <text>|--issue-file <path>] [--plan <text>|--plan-file <path>] [--user-check <passed|failed>] [--codex-thread-id <id>] [--abandoned|--completed|--all] [--json]",
     showHelpOnBareInvocation: false,
     handlerName: "commandSession",
-    allowedFlagKeys: Object.freeze(["json"]),
+    allowedFlagKeys: Object.freeze(["json", "abandoned", "completed", "all"]),
     inlineOptionMode: "delegate",
     allowedValueOptionNames: Object.freeze([]),
     canDelegateInlineOptions: (positional = []) => Array.isArray(positional) && positional.length > 0

package/src/server/sessionRuntime/constants.js

@@ -16,15 +16,62 @@ const SESSION_STATE_RELATIVE_PATH = ".jskit/sessions";
 const PROMPT_DIRECTORY = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "prompts");
 
 const INPUT_NONE = Object.freeze({ type: "none" });
+const ISSUE_TITLE_INPUT = Object.freeze({
+  extract: "issue_title",
+  formatHint: "text",
+  label: "Approved issue title",
+  name: "issueTitle",
+  required: true,
+  type: "text"
+});
 const ISSUE_TEXT_INPUT = Object.freeze({
   extract: "issue_text",
   formatHint: "markdown",
-  label: "Approved issue text",
+  label: "Approved issue body",
   multiline: true,
   name: "issue",
   required: true,
   type: "text"
 });
+const ISSUE_DRAFT_INPUT = Object.freeze({
+  fields: Object.freeze([
+    ISSUE_TITLE_INPUT,
+    ISSUE_TEXT_INPUT
+  ]),
+  type: "object"
+});
+const ISSUE_TITLE_OUTPUT = Object.freeze({
+  extract: "issue_title",
+  field: "issueTitle",
+  formatHint: "text",
+  label: "Issue title",
+  required: true
+});
+const ISSUE_TEXT_OUTPUT = Object.freeze({
+  extract: "issue_text",
+  field: "issue",
+  formatHint: "markdown",
+  label: "Issue body",
+  multiline: true,
+  required: true
+});
+const PLAN_INPUT = Object.freeze({
+  extract: "plan",
+  formatHint: "markdown",
+  label: "Approved plan",
+  multiline: true,
+  name: "plan",
+  required: true,
+  type: "text"
+});
+const PLAN_OUTPUT = Object.freeze({
+  extract: "plan",
+  field: "plan",
+  formatHint: "markdown",
+  label: "Plan",
+  multiline: true,
+  required: true
+});
 const USER_CHECK_INPUT = Object.freeze({
   label: "User check result",
   name: "userCheck",
@@ -35,19 +82,30 @@ const USER_CHECK_INPUT = Object.freeze({
   required: true,
   type: "choice"
 });
-const CODEX_WORKTREE_OUTPUT = Object.freeze({
-  field: "worktree",
-  formatHint: "git_changes"
-});
-
-function codexHandoff(expectedOutput) {
+function codexHandoff(expectedOutput, {
+  autoInject = false,
+  promptActionLabel = ""
+} = {}) {
+  const expectedOutputs = Object.freeze(Array.isArray(expectedOutput) ? [...expectedOutput] : [expectedOutput]);
   return Object.freeze({
-    expectedOutput,
+    ...(autoInject ? { autoInject: true } : {}),
+    expectedOutput: expectedOutputs[expectedOutputs.length - 1] || null,
+    expectedOutputs,
     mode: "inject_prompt",
-    promptField: "prompt"
+    promptField: "prompt",
+    ...(promptActionLabel ? { promptActionLabel } : {})
   });
 }
 
+const PLAN_EXECUTION_CODEX_HANDOFF = codexHandoff([], {
+  autoInject: true,
+  promptActionLabel: "Execute plan"
+});
+const REVIEW_EXECUTION_CODEX_HANDOFF = codexHandoff([], {
+  autoInject: true,
+  promptActionLabel: "Start review"
+});
+
 function defineStep({
   buttonLabel,
   codex = undefined,
@@ -57,7 +115,8 @@ function defineStep({
   kind = "automatic",
   label,
   nextCommandTemplate = "jskit session {{session_id}} step",
-  preconditions = []
+  preconditions = [],
+  utilityActions = []
 }) {
   return Object.freeze({
     buttonLabel,
@@ -68,27 +127,35 @@ function defineStep({
     kind,
     label,
     nextCommandTemplate,
-    preconditions: Object.freeze([...preconditions])
+    preconditions: Object.freeze([...preconditions]),
+    utilityActions: Object.freeze([...utilityActions])
   });
 }
 
 const STEP_DEFINITIONS = Object.freeze([
   defineStep({
     buttonLabel: "Create session",
-    description: "Create the filesystem-backed session state.",
+    description: "Create the filesystem-backed session record.",
     id: "session_created",
     label: "Session created"
   }),
   defineStep({
     buttonLabel: "Create worktree",
-    description: "Create the isolated session worktree and branch.",
+    description: "Create the isolated branch and worktree for this session.",
     id: "worktree_created",
     label: "Worktree created",
     preconditions: ["session_exists", "git_repository", "git_current_branch"]
   }),
   defineStep({
-    buttonLabel: "Render issue prompt",
-    description: "Render the prompt Codex should use to draft the GitHub issue.",
+    buttonLabel: "Install dependencies",
+    description: "Install Node dependencies inside the session worktree before Codex starts.",
+    id: "dependencies_installed",
+    label: "Dependencies installed",
+    preconditions: ["session_exists", "worktree_exists"]
+  }),
+  defineStep({
+    buttonLabel: "Submit prompt to Codex",
+    description: "Capture the initial change request and send it to Codex to draft a GitHub issue.",
     id: "issue_prompt_rendered",
     input: Object.freeze({
       label: "What should change?",
@@ -99,20 +166,19 @@ const STEP_DEFINITIONS = Object.freeze([
       type: "text"
     }),
     kind: "human_input",
-    label: "Issue prompt rendered",
+    label: "Initial issue prompt",
     nextCommandTemplate: "jskit session {{session_id}} step --prompt \"<what should change>\"",
     preconditions: ["session_exists"]
   }),
   defineStep({
-    buttonLabel: "Save issue text",
-    codex: codexHandoff(Object.freeze({
-      extract: "issue_text",
-      field: "issue",
-      formatHint: "markdown"
-    })),
-    description: "Save the approved issue text produced by Codex.",
+    buttonLabel: "Save issue draft",
+    codex: codexHandoff([
+      ISSUE_TITLE_OUTPUT,
+      ISSUE_TEXT_OUTPUT
+    ]),
+    description: "Save the approved issue title and body drafted by Codex.",
     id: "issue_drafted",
-    input: ISSUE_TEXT_INPUT,
+    input: ISSUE_DRAFT_INPUT,
     kind: "codex_output",
     label: "Issue drafted",
     nextCommandTemplate: "jskit session {{session_id}} step --issue -",
@@ -120,113 +186,83 @@ const STEP_DEFINITIONS = Object.freeze([
   }),
   defineStep({
     buttonLabel: "Create GitHub issue",
-    description: "Create the GitHub issue with gh.",
+    description: "Create the GitHub issue from the approved draft.",
     id: "issue_created",
     label: "Issue created",
     preconditions: ["session_exists", "issue_text_exists", "github_auth", "github_origin"]
   }),
   defineStep({
-    buttonLabel: "Render implementation prompt",
-    description: "Render the prompt Codex should use to implement the approved issue.",
-    id: "implementation_prompt_rendered",
-    kind: "codex_prompt",
-    label: "Implementation prompt rendered",
-    preconditions: ["session_exists", "issue_artifacts"]
+    buttonLabel: "Execute plan",
+    codex: codexHandoff(PLAN_OUTPUT),
+    description: "Save the approved implementation plan, comment it on the GitHub issue, and submit it to Codex.",
+    id: "plan_made",
+    input: PLAN_INPUT,
+    kind: "codex_output",
+    label: "Plan execution",
+    nextCommandTemplate: "jskit session {{session_id}} step --plan -",
+    preconditions: ["session_exists", "issue_text_exists", "issue_url_exists", "worktree_exists"]
   }),
   defineStep({
-    buttonLabel: "Detect implementation changes",
-    codex: codexHandoff(CODEX_WORKTREE_OUTPUT),
-    description: "Confirm that Codex changed files in the session worktree.",
-    id: "implementation_changes_detected",
-    kind: "codex_output",
-    label: "Changes detected",
-    preconditions: ["session_exists", "worktree_exists"]
+    buttonLabel: "Accept changes",
+    description: "Review the worktree diff and accept the changes as ready to commit.",
+    id: "implementation_changes_accepted",
+    kind: "user_check",
+    label: "Changes accepted",
+    preconditions: ["session_exists", "worktree_exists"],
+    utilityActions: Object.freeze([
+      Object.freeze({
+        id: "session_diff",
+        kind: "diff",
+        label: "Review changes",
+        nextCommandTemplate: "jskit session {{session_id}} diff"
+      })
+    ])
   }),
   defineStep({
     buttonLabel: "Commit implementation",
-    description: "Commit the implementation changes in the session worktree.",
+    description: "Commit the accepted implementation changes in the session worktree.",
     id: "implementation_changes_committed",
     label: "Changes committed",
     preconditions: ["session_exists", "worktree_exists"]
   }),
   defineStep({
-    buttonLabel: "Render review prompt 1",
-    description: "Render the first Codex review prompt for the committed changes.",
-    id: "initial_review_prompt_rendered",
+    buttonLabel: "Start review",
+    description: "Submit the code review prompt to Codex for the committed changes.",
+    id: "review_prompt_rendered",
     kind: "codex_prompt",
-    label: "Review prompt rendered 1",
+    label: "Review execution",
     preconditions: ["session_exists", "worktree_exists"]
   }),
   defineStep({
-    buttonLabel: "Detect review changes 1",
-    codex: codexHandoff(CODEX_WORKTREE_OUTPUT),
-    description: "Commit any changes Codex made after the first review pass.",
-    id: "initial_review_changes_detected",
-    kind: "codex_output",
-    label: "Review changes detected 1",
-    preconditions: ["session_exists", "worktree_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Save user check 1",
-    description: "Record whether the first user check passed.",
-    id: "initial_user_check_completed",
-    input: USER_CHECK_INPUT,
+    buttonLabel: "Accept review changes",
+    description: "Review the post-review worktree diff and accept it as ready to commit.",
+    id: "review_changes_accepted",
     kind: "user_check",
-    label: "User check 1",
-    nextCommandTemplate: "jskit session {{session_id}} step --user-check passed",
-    preconditions: ["session_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Render review prompt 2",
-    description: "Render the second Codex review prompt for the committed changes.",
-    id: "followup_review_prompt_rendered",
-    kind: "codex_prompt",
-    label: "Review prompt rendered 2",
-    preconditions: ["session_exists", "worktree_exists"]
+    label: "Review changes accepted",
+    preconditions: ["session_exists", "worktree_exists"],
+    utilityActions: Object.freeze([
+      Object.freeze({
+        id: "session_diff",
+        kind: "diff",
+        label: "Review changes",
+        nextCommandTemplate: "jskit session {{session_id}} diff"
+      })
+    ])
   }),
   defineStep({
-    buttonLabel: "Detect review changes 2",
-    codex: codexHandoff(CODEX_WORKTREE_OUTPUT),
-    description: "Commit any changes Codex made after the second review pass.",
-    id: "followup_review_changes_detected",
-    kind: "codex_output",
-    label: "Review changes detected 2",
+    buttonLabel: "Commit review changes",
+    description: "Commit accepted review changes, or record that no review changes were needed.",
+    id: "review_changes_committed",
+    label: "Review changes committed",
     preconditions: ["session_exists", "worktree_exists"]
   }),
   defineStep({
-    buttonLabel: "Save user check 2",
-    description: "Record whether the second user check passed.",
-    id: "followup_user_check_completed",
+    buttonLabel: "Save user check",
+    description: "Record whether the user’s manual check passed.",
+    id: "user_check_completed",
     input: USER_CHECK_INPUT,
     kind: "user_check",
-    label: "User check 2",
-    nextCommandTemplate: "jskit session {{session_id}} step --user-check passed",
-    preconditions: ["session_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Render final review prompt",
-    description: "Render the final Codex review prompt before verification and PR.",
-    id: "final_review_prompt_rendered",
-    kind: "codex_prompt",
-    label: "Review prompt rendered 3",
-    preconditions: ["session_exists", "worktree_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Detect final review changes",
-    codex: codexHandoff(CODEX_WORKTREE_OUTPUT),
-    description: "Commit any changes Codex made after the final review pass.",
-    id: "final_review_changes_detected",
-    kind: "codex_output",
-    label: "Review changes detected 3",
-    preconditions: ["session_exists", "worktree_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Save final user check",
-    description: "Record whether the final user check passed.",
-    id: "final_user_check_completed",
-    input: USER_CHECK_INPUT,
-    kind: "user_check",
-    label: "User check 3",
+    label: "User check",
     nextCommandTemplate: "jskit session {{session_id}} step --user-check passed",
     preconditions: ["session_exists"]
   }),
@@ -234,36 +270,22 @@ const STEP_DEFINITIONS = Object.freeze([
     buttonLabel: "Run verification",
     description: "Run the project verification command in the session worktree.",
     id: "doctor_run",
-    label: "Doctor run",
-    preconditions: ["session_exists", "worktree_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Push branch",
-    description: "Push the session branch to origin.",
-    id: "branch_pushed",
-    label: "Branch pushed",
+    label: "Verification run",
     preconditions: ["session_exists", "worktree_exists"]
   }),
   defineStep({
-    buttonLabel: "Create PR",
-    description: "Create a GitHub pull request for the session branch.",
+    buttonLabel: "Push branch and create PR",
+    description: "Push the session branch to origin and create a GitHub pull request.",
     id: "pr_created",
-    label: "PR created",
+    label: "Branch pushed, PR created",
     preconditions: ["session_exists", "worktree_exists"]
   }),
   defineStep({
-    buttonLabel: "Merge PR",
-    description: "Merge the pull request and close the GitHub issue.",
+    buttonLabel: "Merge PR and remove worktree",
+    description: "Merge the pull request, close the GitHub issue, and remove the session worktree.",
     id: "pr_merged",
-    label: "PR merged",
-    preconditions: ["session_exists", "pr_url_exists"]
-  }),
-  defineStep({
-    buttonLabel: "Remove worktree",
-    description: "Remove the session worktree after the PR has merged.",
-    id: "worktree_removed",
-    label: "Worktree removed",
-    preconditions: ["session_exists"]
+    label: "PR merged, worktree removed",
+    preconditions: ["session_exists", "pr_url_exists", "worktree_exists"]
   }),
   defineStep({
     buttonLabel: "Finish session",
@@ -292,5 +314,7 @@ export {
   STEP_IDS,
   STEP_LABEL_BY_ID,
   STEP_PRECONDITION_NAMES,
+  PLAN_EXECUTION_CODEX_HANDOFF,
+  REVIEW_EXECUTION_CODEX_HANDOFF,
   SESSION_STATE_RELATIVE_PATH
 };

package/src/server/sessionRuntime/paths.js

@@ -68,10 +68,9 @@ function resolveSessionPaths({ targetRoot, sessionId = "" } = {}) {
   const sessionsRoot = path.join(sessionStateRoot, "active");
   const completedSessionsRoot = path.join(sessionStateRoot, "completed");
   const abandonedSessionsRoot = path.join(sessionStateRoot, "abandoned");
-  const worktreesRoot = path.join(sessionStateRoot, "worktrees");
   const normalizedSessionId = sessionId ? normalizeSessionId(sessionId) : "";
   const sessionRoot = normalizedSessionId ? path.join(sessionsRoot, normalizedSessionId) : "";
-  const worktree = normalizedSessionId ? path.join(worktreesRoot, normalizedSessionId) : "";
+  const worktree = normalizedSessionId ? path.join(sessionRoot, "worktree") : "";
   const branch = normalizedSessionId ? `jskit-studio/${normalizedSessionId}` : "";
 
   return Object.freeze({
@@ -85,8 +84,7 @@ function resolveSessionPaths({ targetRoot, sessionId = "" } = {}) {
     sessionsRoot,
     sessionStateRoot,
     targetRoot: normalizedTargetRoot,
-    worktree,
-    worktreesRoot
+    worktree
   });
 }