feat: align with the request headers in the copilot extension version 0.38.2 and update opencode plugin to set header x-session-id

Author: caozhiyuan

.opencode/plugins/subagent-marker.js

@@ -2,6 +2,7 @@ const MARKER_PREFIX = "__SUBAGENT_MARKER__"
 
 const subagentSessions = new Set()
 const markedSessions = new Set()
+const sessionParentMap = new Map()
 
 const getSessionInfo = (event) => {
   if (!event || typeof event !== "object") return undefined
@@ -17,8 +18,13 @@ export const SubagentMarkerPlugin = async () => {
     event: async ({ event }) => {
       if (event.type === "session.created") {
         const info = getSessionInfo(event)
-        if (info?.id && info.parentID) {
-          subagentSessions.add(info.id)
+        if (info?.id) {
+          if (info.parentID) {
+            subagentSessions.add(info.id)
+            sessionParentMap.set(info.id, info.parentID)
+          } else {
+            sessionParentMap.set(info.id, info.id)
+          }
         }
         return
       }
@@ -28,6 +34,7 @@ export const SubagentMarkerPlugin = async () => {
         if (info?.id) {
           subagentSessions.delete(info.id)
           markedSessions.delete(info.id)
+          sessionParentMap.delete(info.id)
         }
       }
     },
@@ -58,8 +65,14 @@ export const SubagentMarkerPlugin = async () => {
           end: Date.now(),
         },
       })
-
       markedSessions.add(sessionID)
     },
+    "chat.headers": async (input, output) => {
+      const { sessionID } = input
+      const sessionIdValue = sessionParentMap.get(sessionID)
+      if (sessionIdValue) {
+        output.headers["x-session-id"] = sessionIdValue
+      }
+    },
   }
 }

README.md

@@ -377,7 +377,7 @@ You can also read more about IDE integration here: [Add Claude Code to your IDE]
 
 ### Subagent Marker Integration (Optional)
 
-This project supports `X-Initiator: agent` for subagent-originated requests.
+This project supports `x-initiator: agent` for subagent-originated requests.
 
 #### Claude Code plugin producer (marketplace-based)
 
@@ -398,15 +398,31 @@ Install the plugin from the marketplace:
 /plugin install claude-plugin@copilot-api-marketplace
 ```
 
-After installation, the plugin injects `__SUBAGENT_MARKER__...` on `SubagentStart`, and this proxy uses it to infer `X-Initiator: agent`.
+After installation, the plugin injects `__SUBAGENT_MARKER__...` on `SubagentStart`, and this proxy uses it to infer `x-initiator: agent`.
 
 #### Opencode plugin producer
 
-For opencode, use the plugin implementation at:
+The marker producer is packaged as an opencode plugin located at `.opencode/plugins/subagent-marker.js`.
 
-- `.opencode/plugins/subagent-marker.js`
+**Installation:**
 
-This plugin tracks sub-sessions and prepends a marker system reminder to subagent chat messages.
+Copy the plugin file to your opencode plugins directory:
+
+```sh
+# Clone or download this repository, then copy the plugin
+cp .opencode/plugins/subagent-marker.js ~/.config/opencode/plugins/
+```
+
+Or manually create the file at `~/.config/opencode/plugins/subagent-marker.js` with the plugin content.
+
+**Features:**
+
+- Tracks sub-sessions created by subagents
+- Automatically prepends a marker system reminder (`__SUBAGENT_MARKER__...`) to subagent chat messages
+- Sets `x-session-id` header for session tracking
+- Enables this proxy to infer `x-initiator: agent` for subagent-originated requests
+
+The plugin hooks into `session.created`, `session.deleted`, `chat.message`, and `chat.headers` events to provide seamless subagent marker functionality.
 
 ## Running from Source
 

src/lib/api-config.ts

@@ -1,13 +1,11 @@
-import { randomUUID } from "node:crypto"
-
 import type { State } from "./state"
 
 export const standardHeaders = () => ({
   "content-type": "application/json",
   accept: "application/json",
 })
 
-const COPILOT_VERSION = "0.37.6"
+const COPILOT_VERSION = "0.38.2"
 const EDITOR_PLUGIN_VERSION = `copilot-chat/${COPILOT_VERSION}`
 const USER_AGENT = `GitHubCopilotChat/${COPILOT_VERSION}`
 
@@ -17,7 +15,11 @@ export const copilotBaseUrl = (state: State) =>
   state.accountType === "individual" ?
     "https://api.githubcopilot.com"
   : `https://api.${state.accountType}.githubcopilot.com`
-export const copilotHeaders = (state: State, vision: boolean = false) => {
+export const copilotHeaders = (
+  state: State,
+  requestId: string,
+  vision: boolean = false,
+) => {
   const headers: Record<string, string> = {
     Authorization: `Bearer ${state.copilotToken}`,
     "content-type": standardHeaders()["content-type"],
@@ -27,12 +29,22 @@ export const copilotHeaders = (state: State, vision: boolean = false) => {
     "user-agent": USER_AGENT,
     "openai-intent": "conversation-agent",
     "x-github-api-version": API_VERSION,
-    "x-request-id": randomUUID(),
+    "x-request-id": requestId,
     "x-vscode-user-agent-library-version": "electron-fetch",
+    "x-agent-task-id": requestId,
+    "x-interaction-type": "conversation-agent",
   }
 
   if (vision) headers["copilot-vision-request"] = "true"
 
+  if (state.macMachineId) {
+    headers["vscode-machineid"] = state.macMachineId
+  }
+
+  if (state.vsCodeSessionId) {
+    headers["vscode-sessionid"] = state.vsCodeSessionId
+  }
+
   return headers
 }
 

src/lib/state.ts

@@ -8,6 +8,9 @@ export interface State {
   models?: ModelsResponse
   vsCodeVersion?: string
 
+  macMachineId?: string
+  vsCodeSessionId?: string
+
   manualApprove: boolean
   rateLimitWait: boolean
   showToken: boolean

src/lib/utils.ts

@@ -1,4 +1,10 @@
+import type { Context } from "hono"
+
 import consola from "consola"
+import { createHash, randomUUID } from "node:crypto"
+import { networkInterfaces } from "node:os"
+
+import type { AnthropicMessagesPayload } from "~/routes/messages/anthropic-types"
 
 import { getModels } from "~/services/copilot/get-models"
 import { getVSCodeVersion } from "~/services/get-vscode-version"
@@ -24,3 +30,109 @@ export const cacheVSCodeVersion = async () => {
 
   consola.info(`Using VSCode version: ${response}`)
 }
+
+const invalidMacAddresses = new Set([
+  "00:00:00:00:00:00",
+  "ff:ff:ff:ff:ff:ff",
+  "ac:de:48:00:11:22",
+])
+
+function validateMacAddress(candidate: string): boolean {
+  const tempCandidate = candidate.replaceAll("-", ":").toLowerCase()
+  return !invalidMacAddresses.has(tempCandidate)
+}
+
+export function getMac(): string | null {
+  const ifaces = networkInterfaces()
+  // eslint-disable-next-line guard-for-in
+  for (const name in ifaces) {
+    const networkInterface = ifaces[name]
+    if (networkInterface) {
+      for (const { mac } of networkInterface) {
+        if (validateMacAddress(mac)) {
+          return mac
+        }
+      }
+    }
+  }
+  return null
+}
+
+export const cacheMacMachineId = () => {
+  const macAddress = getMac() ?? randomUUID()
+  state.macMachineId = createHash("sha256")
+    .update(macAddress, "utf8")
+    .digest("hex")
+  consola.debug(`Using machine ID: ${state.macMachineId}`)
+}
+
+export const cacheVsCodeSessionId = () => {
+  state.vsCodeSessionId = randomUUID() + Date.now().toString()
+  consola.debug(`Generated VSCode session ID: ${state.vsCodeSessionId}`)
+}
+
+interface PayloadMessage {
+  role?: string
+  content?: string | Array<{ type?: string; text?: string }> | null
+  type?: string
+}
+
+const findLastUserContent = (
+  messages: Array<PayloadMessage>,
+): string | null => {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i]
+    if (msg.role === "user" && msg.content) {
+      if (typeof msg.content === "string") {
+        return msg.content
+      } else if (Array.isArray(msg.content)) {
+        const array = msg.content.filter((n) => n.type !== "tool_result")
+        if (array.length > 0) {
+          return JSON.stringify(array)
+        }
+      }
+    }
+  }
+  return null
+}
+
+export const generateRequestIdFromPayload = (payload: {
+  messages: string | Array<PayloadMessage> | undefined
+}): string => {
+  const messages = payload.messages
+  if (messages) {
+    const lastUserContent =
+      typeof messages === "string" ? messages : findLastUserContent(messages)
+
+    if (lastUserContent) {
+      return getUUID(lastUserContent)
+    }
+  }
+
+  return randomUUID()
+}
+
+export const getRootSessionId = (
+  anthropicPayload: AnthropicMessagesPayload,
+  c: Context,
+): string | undefined => {
+  let sessionId: string | undefined
+  if (anthropicPayload.metadata?.user_id) {
+    const sessionMatch = new RegExp(/_session_(.+)$/).exec(
+      anthropicPayload.metadata.user_id,
+    )
+    sessionId = sessionMatch ? sessionMatch[1] : undefined
+  } else {
+    sessionId = c.req.header("x-session-id")
+  }
+  if (sessionId) {
+    return getUUID(sessionId)
+  }
+  return sessionId
+}
+
+const getUUID = (content: string): string => {
+  const hash = createHash("sha256").update(content).digest("hex")
+  const hash32 = hash.slice(0, 32)
+  return `${hash32.slice(0, 8)}-${hash32.slice(8, 12)}-${hash32.slice(12, 16)}-${hash32.slice(16, 20)}-${hash32.slice(20)}`
+}

src/routes/chat-completions/handler.ts

@@ -7,7 +7,7 @@ import { createHandlerLogger } from "~/lib/logger"
 import { checkRateLimit } from "~/lib/rate-limit"
 import { state } from "~/lib/state"
 import { getTokenCount } from "~/lib/tokenizer"
-import { isNullish } from "~/lib/utils"
+import { generateRequestIdFromPayload, isNullish } from "~/lib/utils"
 import {
   createChatCompletions,
   type ChatCompletionResponse,
@@ -49,7 +49,8 @@ export async function handleCompletion(c: Context) {
     logger.debug("Set max_tokens to:", JSON.stringify(payload.max_tokens))
   }
 
-  const response = await createChatCompletions(payload)
+  const requestId = generateRequestIdFromPayload(payload)
+  const response = await createChatCompletions(payload, { requestId })
 
   if (isNonStreaming(response)) {
     logger.debug("Non-streaming response:", JSON.stringify(response))