@magpie-community/opencode-zcode-auth 0.1.14 → 0.1.16

package/README.md

@@ -31,7 +31,11 @@ over Anthropic's Messages API. Provider id: `zcode`.
   - Uses the account the ZCode app on this computer is signed in to. For
     every request it reads ZCode's own credentials (`~/.zcode/v2`), so it
     follows ZCode as it signs in again, renews its session or switches to a
-    team's plan.
+    team's plan, but only while ZCode is signed in to that same account.
+    Once ZCode signs out, or signs in to another account, the sign-in uses
+    what it saved when it was added; when that session has run out, it
+    asks to be signed in again. It never sends one account's requests with
+    another's credentials: to use both, add the app's sign-in once for each.
 - **GLM Coding Plan API key**
   - Paste a key (`<id>.<secret>`) and say which site it is from.
 

package/index.mjs

@@ -19,7 +19,7 @@
 import { createDecipheriv, createHash } from "node:crypto"
 import { existsSync, readFileSync, readdirSync } from "node:fs"
 import { arch, homedir, release, userInfo } from "node:os"
-import { basename, join } from "node:path"
+import { join } from "node:path"
 import PROMPT from "./prompt.mjs"
 
 const PROVIDER = "zcode"
@@ -1044,7 +1044,7 @@ function ownSignIn() {
 function asZCode() {
   return {
     url: "",
-    instructions: "Uses the account the ZCode app is signed in to, and follows it.",
+    instructions: "Uses the account the ZCode app is signed in to, and follows it while ZCode stays signed in to that account.",
     method: "auto",
     async callback() {
       const own = ownSignIn()
@@ -1064,10 +1064,13 @@ function stateOf(auth) {
       s = JSON.parse(auth.refresh)
     } catch {}
     if (s.source === "zcode") {
-      // ZCode's own, read now: what it was when this was signed in, if
-      // ZCode has since signed out
+      // ZCode's own, read now, while ZCode is signed in to this same
+      // account. Signed out, or signed in to another account since, it is
+      // what it was when this was signed in: another account's key would
+      // send this account's requests as that one, and an expired session
+      // says sign in again (EXPIRED) rather than borrowing another's.
       const own = ownSignIn()
-      if (own) {
+      if (own && own.user === String(auth.accountId ?? "")) {
         const { user, ...now } = own
         s = { source: "zcode", device: s.device, plan: s.plan, ...now }
       }
@@ -1299,20 +1302,47 @@ function startHeaders(h, jwt) {
   h.set("x-zcode-trace-id", uuid())
 }
 
+// WORK_DIR and WORK_GIT are where magpie tells a plugin's fetch the agent
+// that asked works: the folder, percent-encoded, and "yes" or "no" for a
+// git repository, each left off when magpie doesn't know it (magpie's
+// provider.WorkDirHeader and WorkGitHeader). They are for the plugin, not
+// the vendor.
+const WORK_DIR = "x-magpie-work-dir"
+const WORK_GIT = "x-magpie-work-git"
+
+// workPlace takes WORK_DIR and WORK_GIT off h: {dir?, git?}, what magpie
+// said of where the agent works.
+function workPlace(h) {
+  const place = {}
+  const dir = h.get(WORK_DIR)
+  if (dir) {
+    try {
+      place.dir = decodeURIComponent(dir)
+    } catch {}
+  }
+  const git = h.get(WORK_GIT)
+  if (place.dir && (git === "yes" || git === "no")) place.git = git
+  h.delete(WORK_DIR)
+  h.delete(WORK_GIT)
+  return place
+}
+
 // environment is the prompt's environment section; provider and model
-// name the powered-by line, left out with no model.
-function environment(provider, model) {
+// name the powered-by line, left out with no model. The plugin runs in
+// magpie, not in the agent's folder: the working directory and whether it
+// is a git repository are the agent's, as magpie tells them (place), and
+// each is left out when it isn't told rather than said as magpie's own
+// (#86). The agent's shell isn't known here either, so it isn't said; the
+// platform and OS version are this computer's, as ZCode's X-Os-* headers
+// say them.
+function environment(provider, model, place = {}) {
   const e = PROMPT.environment
-  const sh = process.env.SHELL || process.env.ComSpec
-  const lines = [
-    e.heading,
-    e.invokedLine,
-    `- ${e.cwdLabel}: ${process.cwd()}`,
-    `- ${e.gitLabel}: ${e.gitNo}`,
-    `- ${e.platformLabel}: ${process.platform}`,
-    `- ${e.shellLabel}: ${sh ? basename(sh) : "unknown"}`,
-    `- ${e.osVersionLabel}: ${osVersion()}`,
-  ]
+  const lines = [e.heading, e.invokedLine]
+  if (place.dir) {
+    lines.push(`- ${e.cwdLabel}: ${place.dir}`)
+    if (place.git) lines.push(`- ${e.gitLabel}: ${place.git === "yes" ? "yes" : e.gitNo}`)
+  }
+  lines.push(`- ${e.platformLabel}: ${process.platform}`, `- ${e.osVersionLabel}: ${osVersion()}`)
   if (model) lines.push(e.poweredByLine.replace("{provider}", provider).replace("{model}", model))
   return lines.join("\n")
 }
@@ -1335,9 +1365,10 @@ function contextPrefix() {
 // system blocks, then the agent's own system text uncached; the context
 // prefix as the first turn; no cache mark in the turns but on the last
 // block of the last; none on the tools; metadata.user_id naming the
-// sign-in's device. site names the powered-by line's provider. A body that
-// isn't a Messages request goes as it is.
-function dress(text, site, device) {
+// sign-in's device. site names the powered-by line's provider, place where
+// the agent works (workPlace). A body that isn't a Messages request goes as
+// it is.
+function dress(text, site, device, place) {
   if (typeof text !== "string" || !text.includes("messages")) return text
   let b
   try {
@@ -1358,7 +1389,7 @@ function dress(text, site, device) {
   b.system = [
     cached(PROMPT.cliPrefix),
     cached(PROMPT.stableSections.join("\n\n")),
-    cached("\n\n" + [PROMPT.beforeEnvironment, environment(provider, model), PROMPT.afterEnvironment].join("\n\n")),
+    cached("\n\n" + [PROMPT.beforeEnvironment, environment(provider, model, place), PROMPT.afterEnvironment].join("\n\n")),
     ...own,
   ]
   b.messages = [contextPrefix(), ...b.messages]
@@ -1498,6 +1529,7 @@ export async function ZCodeAuthPlugin({ client }) {
               }
             }
             let h = new Headers(opts.headers)
+            const place = workPlace(h)
             if (start) {
               if (jwtExpired(s.jwt)) throw new Error(EXPIRED)
               if (!s.jwt) throw new Error("ZCode's sign-in has no key; sign in again")
@@ -1506,7 +1538,7 @@ export async function ZCodeAuthPlugin({ client }) {
               startHeaders(h, s.jwt)
               if (opts.body != null) {
                 const text = orig ?? (typeof opts.body === "string" ? opts.body : await new Response(opts.body).text())
-                opts.body = dress(text, s.site, s.device)
+                opts.body = dress(text, s.site, s.device, place)
                 delete opts.duplex
                 h.delete("content-length")
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-zcode-auth",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "OpenCode provider plugin: signs in to Z.ai's or BigModel's (智谱) GLM Coding Plan as ZCode does, including team seats and ZCode's Start Plan",
   "type": "module",
   "main": "./index.mjs",