opencode-forgekeeper 2.2.1 → 2.4.0

package/README.md

@@ -5,7 +5,7 @@ It prefixes the session title with their references, shows the PR/MR status in t
 footer, and tells the agent about new review feedback. It supports GitLab and GitHub. The status
 and review notifications are optional; see [Keep only session titles](#keep-only-session-titles).
 
-Requires OpenCode 2. It replaces
+Requires OpenCode 2.2 or later. It replaces
 [`opencode-forge-session-title`](https://www.npmjs.com/package/opencode-forge-session-title); see
 [Migrating from opencode-forge-session-title](#migrating-from-opencode-forge-session-title).
 
@@ -46,7 +46,9 @@ what's missing, such as `glab is not installed`.
 ## Session targets
 
 The server registers the `set_session_target` tool and adds instructions to the agent's
-context. When you establish or change the primary issue, PR, or MR, the agent sets its full
+context. The current target is stored in the `forgekeeper-session-target` session instruction
+entry. Updates take effect at the next step without changing the system prompt.
+When you establish or change the primary issue, PR, or MR, the agent sets its full
 URL as the session target. Background references, comparisons, and dependencies keep the
 current target. After the agent creates a PR/MR for the current task, it sets the new PR/MR
 as the target, passing the current issue as `issue_url`.
@@ -224,7 +226,9 @@ For each explicit target that is an open PR/MR, the server tells the agent about
 A target that merges or closes gets no more notifications, and a notification waiting for a
 retry is dropped.
 Each notification is a queued synthetic message, followed by a toast in the CLIs that have
-shown the session. The message resumes the session unless `resumeSession` is `false`.
+shown the session. With session tabs on, those CLIs also reopen the session's tab if you
+closed it, without leaving the session you're in. The message resumes the session unless
+`resumeSession` is `false`.
 Messages include the full URL of each PR/MR. PRs/MRs from the title or the branch don't get
 notifications.
 
@@ -384,6 +388,7 @@ notifications resume the session. Set `reviewStatus` to `false` to keep only tit
   and a PR/MR's source branch.
 - `src/status-client.ts` holds the CLI's leases, snapshots, and per-directory settings.
   `src/tui.tsx` connects it to the RPC and renders the footer, dialog, commands, and notices.
+  `src/notice.ts` decides which notices a CLI shows and which tabs it reopens.
 - `src/forge.ts` defines the forge-neutral types, the `Forge` adapter interface, and
   `ForgeTraits` with its optional `automatedReview` and `feedback` capabilities.
 - `src/gitlab-feedback.ts` and `src/github-feedback.ts` read each forge's comments for its

package/dist/index.js

@@ -2423,6 +2423,7 @@ var shorten = (text, length) => text.length > length ? `${text.slice(0, length -
 
 // packages/forgekeeper/src/server.ts
 var SKIP_BRANCHES = new Set(["master", "main", "HEAD", "develop"]);
+var TARGET_KEY = "forgekeeper-session-target";
 var GUIDANCE = [
   "When the user establishes or changes the primary issue, PR, or MR for this session, call set_session_target with its full URL before starting that work.",
   "When the user asks you to work on several issues, PRs, or MRs together, call set_session_target with all of their full URLs in targets. If the user describes them instead of linking them, find them first, then set them before starting that work. When they are all PRs/MRs for one established issue, pass it as issue_url.",
@@ -2430,7 +2431,8 @@ var GUIDANCE = [
   'When the user drops some of several targets from the task, call set_session_target with operation "remove" and their URLs.',
   "Background references, comparisons, and dependencies do not change the target. Follow-ups without a new primary target keep the current target.",
   "Include issue_url only when its relationship to the target PRs/MRs is established. Never carry over the checked-out branch\u2019s issue to another target.",
-  'When the user explicitly returns to work on the checked-out branch, call set_session_target with target "branch".'
+  'When the user explicitly returns to work on the checked-out branch, call set_session_target with target "branch".',
+  `The current session target is in the <context> entry "${TARGET_KEY}". The plugin updates it when it changes, so trust the latest value.`
 ];
 function describeTargets(targets) {
   if (targets.length === 0)
@@ -2459,6 +2461,7 @@ async function drain(tasks, limit) {
 var json = (value) => JSON.parse(JSON.stringify(value));
 async function setupServer(ctx, lookups, status2) {
   const pending = new Map;
+  const instructing = new Map;
   const controller = new AbortController;
   let closing = false;
   const known = new Map;
@@ -2560,6 +2563,7 @@ async function setupServer(ctx, lookups, status2) {
   const tools = await ctx.tool.transform((editor) => {
     editor.add({
       name: "set_session_target",
+      options: { codemode: false },
       description: 'Set the issues, PRs, or MRs this session works on, for its title and PR/MR status. Use target for one full URL, or "branch" to return to branch-based naming. Use targets for several full URLs. The default operation, "replace", sets exactly the given targets; "add" keeps the current targets, and "remove" drops the given ones. Call it after creating a PR/MR for the current task. Without issue_url, the related issue is inferred from the PR/MR source branch name. This only changes local session metadata.',
       input: {
         type: "object",
@@ -2603,6 +2607,7 @@ async function setupServer(ctx, lookups, status2) {
             ...state.prefix ? { prefix: state.prefix } : {}
           });
           watcher?.targetsChanged(sessionID, result.targets);
+          await instruct(sessionID).catch(() => {});
           await rpc.events.emit("targetChanged", { sessionID, ...targetOutput(result.targets) });
           await update(sessionID);
         });
@@ -2610,21 +2615,53 @@ async function setupServer(ctx, lookups, status2) {
       }
     });
   });
+  async function writeInstructions(sessionID) {
+    if (closing)
+      return [];
+    const state = await stateFor(sessionID);
+    const value = `Current session target: ${describeTargets(state.targets)}.`;
+    const entries = await ctx.session.instructions.entry.list({ sessionID });
+    if (entries.some((entry) => entry.key === TARGET_KEY && entry.value === value))
+      return [];
+    if (closing)
+      return [];
+    await ctx.session.instructions.entry.put({ sessionID, key: TARGET_KEY, value });
+    return [value];
+  }
+  function instruct(sessionID) {
+    const next = (instructing.get(sessionID) ?? Promise.resolve()).then(() => writeInstructions(sessionID));
+    const settled = next.catch(() => {});
+    instructing.set(sessionID, settled);
+    settled.then(() => {
+      if (instructing.get(sessionID) === settled)
+        instructing.delete(sessionID);
+    });
+    return next;
+  }
   await ctx.session.hook("context", async (event) => {
     try {
       const session = await ctx.session.get({ sessionID: event.sessionID });
       if (session.parentID || session.location.directory !== ctx.location.directory)
         return;
-      const state = await stateFor(event.sessionID);
-      event.system.push({
-        type: "text",
-        text: [...GUIDANCE, `Current session target: ${describeTargets(state.targets)}.`].join(`
-`)
-      });
+      event.system.push({ type: "text", text: GUIDANCE.join(`
+`) });
+      const written = await instruct(event.sessionID);
+      if (written.length)
+        event.system.push({ type: "text", text: written.join(`
+`) });
     } catch {}
   });
   (async () => {
-    for await (const event of ctx.event.subscribe({ signal: controller.signal })) {
+    for await (const event of ctx.event.subscribe({
+      types: [
+        "session.renamed",
+        "session.moved",
+        "session.execution.succeeded",
+        "session.execution.failed",
+        "vcs.branch.updated"
+      ],
+      signal: controller.signal
+    })) {
       const { type } = event;
       const sessionID = event.data?.sessionID;
       if ((type === "session.renamed" || type === "session.execution.succeeded") && sessionID) {

package/dist/tui.js

@@ -1106,6 +1106,20 @@ function detailsMessage(snapshot) {
 `);
 }
 
+// packages/forgekeeper/src/notice.ts
+function showNotice(notice, host) {
+  const { sessionID } = notice;
+  if (sessionID && !host.hasShown(sessionID))
+    return;
+  if (sessionID && notice.variant === "info")
+    host.openTab(sessionID);
+  host.toast({
+    ...notice.title ? { title: notice.title } : {},
+    message: notice.message,
+    variant: notice.variant
+  });
+}
+
 // packages/forgekeeper/src/rpc.ts
 var urls = {
   url: { type: "string" },
@@ -2066,28 +2080,18 @@ var tui_default = {
         return null;
       }
     });
-    const stops = [
-      rpc.events.on("status", (event) => {
-        const {
-          directory,
-          key: key2,
-          snapshot: snapshot2
-        } = event.data;
-        client.receive(directory, key2, snapshot2);
-      }),
-      rpc.events.on("notice", (event) => {
-        const notice = event.data;
-        if (notice.sessionID && !client.hasShown(notice.sessionID))
-          return;
-        context.ui.toast.show({
-          ...notice.title ? {
-            title: notice.title
-          } : {},
-          message: notice.message,
-          variant: notice.variant
-        });
-      })
-    ];
+    const stops = [rpc.events.on("status", (event) => {
+      const {
+        directory,
+        key: key2,
+        snapshot: snapshot2
+      } = event.data;
+      client.receive(directory, key2, snapshot2);
+    }), rpc.events.on("notice", (event) => showNotice(event.data, {
+      hasShown: client.hasShown,
+      openTab: (sessionID) => context.ui.tabs.open(sessionID),
+      toast: context.ui.toast.show
+    }))];
     return () => {
       clearInterval(heartbeat);
       for (const stop of stops)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-forgekeeper",
-  "version": "2.2.1",
+  "version": "2.4.0",
   "description": "OpenCode plugin that tracks each session's GitHub and GitLab issues and PRs/MRs: title prefixes, a PR/MR status footer, and review notifications",
   "author": {
     "name": "Pedro Pombeiro",
@@ -41,9 +41,9 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@opencode/plugin": "^2.0.26",
-    "@opentui/core": ">=0.5.8",
-    "@opentui/solid": ">=0.5.8",
+    "@opencode/plugin": "^2.2.0",
+    "@opentui/core": ">=0.7.0",
+    "@opentui/solid": ">=0.7.0",
     "solid-js": ">=1.9.0"
   }
 }