@magpie-community/opencode-workbuddy-auth 0.1.27 → 0.1.29

package/README.md

@@ -85,7 +85,18 @@ default one, as the app does.
 
 WorkBuddy refuses some agents' identity lines as an "unapproved channel"
 (11128), so those lines are reworded before a chat goes out. Since 0.1.27
-(#279) that includes DeepSeek Harness's opening line.
+(#279) that includes DeepSeek Harness's opening line. A refusal of words
+not reworded yet is sent once more, since 0.1.29, with the system prompt
+moved into the first user message (inside `<instructions>` tags) and
+WorkBuddy's default system prompt in its place: WorkBuddy checks only the
+system and assistant messages, and the line it matched is then in neither.
+A system message later in the chat becomes a user message where it stands.
+The plugin remembers each refused system prompt while it is loaded, so that
+agent's next chats go moved at once. A refusal that stands after the move
+(words in an assistant message) ends in a hint that names no one client
+(since 0.1.28): WorkBuddy refused words in this client's prompt; use it from
+Hermes, OpenCode or Pi, or add another provider to the group. Neither
+refusal rests the account.
 
 The loader also translates OpenAI-compatible request spellings WorkBuddy
 doesn't take: `max_completion_tokens` becomes `max_tokens`, `developer`

package/index.mjs

@@ -542,6 +542,61 @@ function withSystem(body) {
   }
 }
 
+// WorkBuddy's channel check reads the system and assistant messages only:
+// tried on 2026-10-21 with real accounts on both builds (glm-5.3,
+// deepseek-v4.1-flash, gpt-5.5), each refused line was served in the user's
+// message, a tool's result and a user message's parts, and refused again in
+// the system or an assistant message. It matches a known line whole and
+// exactly (one extra space lets it through), so FLAGGED only ever knows the
+// lines met so far, and another agent's opening line is refused until one is
+// added (Wing on Discord, 10-21, with an agent we couldn't name).
+//
+// systemAsUser is body with its system prompt read to the model as the
+// first thing the user says, in INSTRUCTIONS' tags, and WorkBuddy's default
+// system prompt first, as both builds want a system message there (11128
+// "first message is not system prompt"). A system message later in the chat
+// becomes the user's where it stands. null when there's nothing to move.
+const DEFAULT_SYSTEM = "You are a helpful assistant."
+const INSTRUCTIONS = ["<instructions>\n", "\n</instructions>"]
+
+function textOf(content) {
+  if (typeof content === "string") return content
+  if (!Array.isArray(content)) return ""
+  return content.map((p) => (typeof p?.text === "string" ? p.text : "")).filter(Boolean).join("\n")
+}
+
+// systemKey is the text of a chat's system messages, which a chat refused
+// once is known by: the same agent's next chat goes with systemAsUser at once
+function systemKey(body) {
+  const msgs = chatOf(body)?.messages
+  if (!Array.isArray(msgs)) return ""
+  const key = msgs.filter((m) => m?.role === "system").map((m) => textOf(m.content)).join("\n")
+  return key.trim() === DEFAULT_SYSTEM ? "" : key
+}
+
+function systemAsUser(body) {
+  const b = chatOf(body)
+  const msgs = b?.messages
+  if (!Array.isArray(msgs)) return null
+  let i = 0
+  const lead = []
+  for (; i < msgs.length && msgs[i]?.role === "system"; i++) lead.push(textOf(msgs[i].content))
+  const said = lead.join("\n\n").trim()
+  const rest = msgs.slice(i).map((m) => (m?.role === "system" ? { ...m, role: "user" } : m))
+  const moved = said && said !== DEFAULT_SYSTEM
+  if (!moved && rest.every((m, k) => m === msgs[i + k])) return null
+  if (moved) {
+    const text = INSTRUCTIONS[0] + said + INSTRUCTIONS[1]
+    const u = rest.findIndex((m) => m?.role === "user")
+    if (u < 0) rest.unshift({ role: "user", content: text })
+    else if (typeof rest[u].content === "string") rest[u] = { ...rest[u], content: text + "\n\n" + rest[u].content }
+    else if (Array.isArray(rest[u].content)) rest[u] = { ...rest[u], content: [{ type: "text", text }, ...rest[u].content] }
+    else rest[u] = { ...rest[u], content: text }
+  }
+  b.messages = [{ role: "system", content: DEFAULT_SYSTEM }, ...rest]
+  return JSON.stringify(b)
+}
+
 // normalizeToolChoice converts the object form emitted by OpenAI clients to
 // WorkBuddy's string form. It runs after fitted(), so a named choice follows a
 // tool name that was made safe for WorkBuddy.
@@ -1559,6 +1614,9 @@ function makePlugin(site) {
   // the models of this site that refused tool results then the user's
   // message, for this run: their next chats go with replyAfterTools at once
   const endsAfterTools = new Set()
+  // the system prompts this run WorkBuddy refused as an unapproved channel:
+  // their next chats go with systemAsUser at once, not refused first
+  const refusedSystems = new Set()
   return async ({ client }) => ({
     config: async (config) => {
       config.provider ??= {}
@@ -1629,15 +1687,27 @@ function makePlugin(site) {
             // a model known to turn tool results then the user's message away
             // gets the empty reply between them up front (see endsAfterTools)
             const model = chatOf(body)?.model
-            const quiet = endsAfterTools.has(model) ? replyAfterTools(body) : null
-            let res = await send(quiet ?? body)
-            if (res.status === 400 && !quiet) {
-              const text = await res.text()
-              const again = AFTER_TOOLS_REFUSED.test(text) ? replyAfterTools(body) : null
+            // a system prompt WorkBuddy refused before goes as the user's
+            // words at once (see systemAsUser)
+            const sysKey = systemKey(body)
+            if (sysKey && refusedSystems.has(sysKey)) body = systemAsUser(body) ?? body
+            const shaped = (b) => (endsAfterTools.has(model) ? replyAfterTools(b) ?? b : b)
+            let res = await send(shaped(body))
+            if (res.status === 400) {
+              let text = await res.text()
+              const moved = REFUSED.test(text) && sysKey && !refusedSystems.has(sysKey) ? systemAsUser(body) : null
+              if (moved) {
+                refusedSystems.add(sysKey)
+                if (refusedSystems.size > 256) refusedSystems.delete(refusedSystems.values().next().value)
+                body = moved
+                res = await send(shaped(body))
+                if (res.status === 400) text = await res.text()
+              }
+              const again = res.status === 400 && !endsAfterTools.has(model) && AFTER_TOOLS_REFUSED.test(text) ? replyAfterTools(body) : null
               if (again) {
                 endsAfterTools.add(model)
                 res = await send(again)
-              } else {
+              } else if (res.status === 400) {
                 res = new Response(text, { status: res.status, statusText: res.statusText, headers: res.headers })
               }
             }
@@ -1699,11 +1769,15 @@ function makePlugin(site) {
 
 // REFUSED_HINT is what the user can do about WorkBuddy's "Illegal API
 // invocation from an unapproved channel": both builds answer it to a chat
-// holding words of Codex's or Claude Code's own (magpie #182), whatever the
-// headers. FLAGGED rewrites the ones known; this is for one it doesn't know. It ends the error's message, as magpie's built-in
-// put it (provider.WBRefusedHint), so magpie's routing page says it apart.
+// holding words they turn away, whatever the headers. Codex's and Claude
+// Code's were the first (magpie #182), DeepSeek Harness's and Claude
+// Desktop's came later (#279, #170), and WorkBuddy reads every message, so
+// it names no client. FLAGGED rewrites the words known; this is for ones it
+// doesn't know. It ends the error's message word for word as magpie's
+// Routing page has it (WB_REFUSED in its routing client.js), which says it
+// apart from WorkBuddy's own words.
 const REFUSED_HINT =
-  "WorkBuddy refuses chats from Codex and Claude Code (their system prompt); use it from Hermes, OpenCode or Pi, or add another provider to this group"
+  "WorkBuddy refused words in this client's prompt (most often its system prompt); use it from Hermes, OpenCode or Pi, or add another provider to this group"
 const REFUSED = /unapproved channel|illegal api invocation/i
 
 // RESTRICTED_HINT is what the user can do about WorkBuddy's 403 code 11140
@@ -1781,4 +1855,4 @@ export const WorkBuddyAuthPlugin = makePlugin(SITES.workbuddy)
 export const WorkBuddyAIAuthPlugin = makePlugin(SITES["workbuddy-ai"])
 
 // for tests
-export const _internal = { EDGE_READS, fitShape, replyAfterTools, AFTER_TOOLS_REFUSED, enterpriseUsageOf, notDesktop, textOnly, runsOutOf, packagesOf, endOf, enterpriseHeaders, enterpriseOf, liveModels, browserSignIn, withSystem, normalizeToolChoice, fitTools, fitted, renamed, unflagged, usageOf, desktopHeld, explained, REFUSED_HINT, RESTRICTED_HINT, EXHAUSTED_HINT, freeCredits, creditsOf, priceOf, fresh, SITES, renewing, renewed, SESSION, attend, turnKey, conversationKey, signatureOf }
+export const _internal = { systemAsUser, systemKey, DEFAULT_SYSTEM, EDGE_READS, fitShape, replyAfterTools, AFTER_TOOLS_REFUSED, enterpriseUsageOf, notDesktop, textOnly, runsOutOf, packagesOf, endOf, enterpriseHeaders, enterpriseOf, liveModels, browserSignIn, withSystem, normalizeToolChoice, fitTools, fitted, renamed, unflagged, usageOf, desktopHeld, explained, REFUSED_HINT, RESTRICTED_HINT, EXHAUSTED_HINT, freeCredits, creditsOf, priceOf, fresh, SITES, renewing, renewed, SESSION, attend, turnKey, conversationKey, signatureOf }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-workbuddy-auth",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "OpenCode provider plugins for WorkBuddy's plans: WorkBuddy (CodeBuddy, copilot.tencent.com) and WorkBuddy AI (www.workbuddy.ai)",
   "type": "module",
   "main": "./index.mjs",