feat: include agent instructions in skill matching system prompt

Author: qorzj

src/session.ts

@@ -718,15 +718,15 @@ export class SessionManager {
     options?: { signal?: AbortSignal; sessionId?: string }
   ): Promise<string[]> {
     this.throwIfAborted(options?.signal);
-    let systemPrompt = `When users ask you to perform tasks, check if any of the available skills match. Skills provide specialized capabilities and domain knowledge.\n
+    let systemPrompt = `When users ask you to perform tasks, check if any of the available skills match the goal and situation. Skills provide specialized capabilities and domain knowledge.\n
 Response in JSON format:
 \`\`\`
 {
   "skillNames": ["", ...]
 }
 \`\`\`\n
 If none of the available skills match, respond with an empty array, i.e. \`{"skillNames": []}\`.\n
-The candidate skills are as follows:\n\n`;
+`;
     const simpleSkills = skills
       .filter((x) => !x.isLoaded)
       .map((x) => {
@@ -735,13 +735,23 @@ The candidate skills are as follows:\n\n`;
     if (simpleSkills.length === 0) {
       return [];
     }
-    systemPrompt += "```\n" + JSON.stringify(simpleSkills, null, 2) + "\n```";
 
     const { client, model, baseURL, debugLogEnabled } = this.createOpenAIClient();
     if (!client) {
       return [];
     }
 
+    const agentInstructions = this.loadAgentInstructions();
+    if (agentInstructions) {
+      systemPrompt += `Use the current agent instructions as additional context when deciding which skills match:\n
+<agent-instructions>
+${agentInstructions}
+</agent-instructions>\n
+`;
+    }
+    systemPrompt += "The candidate skills are as follows:\n\n";
+    systemPrompt += "```\n" + JSON.stringify(simpleSkills, null, 2) + "\n```";
+
     try {
       const response = await this.createChatCompletionStream(
         client,

src/tests/session.test.ts

@@ -893,6 +893,88 @@ test("createSession appends default system prompts in prefix-cache-friendly orde
   assert.equal(systemContents[3], "root project instructions");
 });
 
+test("createSession includes agent instructions in the skill matching system prompt", async () => {
+  const workspace = createTempDir("deepcode-skill-match-create-workspace-");
+  const home = createTempDir("deepcode-skill-match-create-home-");
+  setHomeDir(home);
+  globalThis.fetch = (async () => ({ ok: true, text: async () => "" }) as Response) as typeof fetch;
+
+  fs.mkdirSync(path.join(workspace, ".deepcode"), { recursive: true });
+  fs.writeFileSync(path.join(workspace, ".deepcode", "AGENTS.md"), "prefer project-specific skill matching", "utf8");
+  const skillDir = path.join(workspace, ".deepcode", "skills", "project-aware");
+  fs.mkdirSync(skillDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(skillDir, "SKILL.md"),
+    "---\nname: project-aware\ndescription: Match project-specific instructions\n---\n# Project Aware\n",
+    "utf8"
+  );
+
+  const requests: any[] = [];
+  const client = {
+    chat: {
+      completions: {
+        create: async (request: any) => {
+          requests.push(request);
+          return { choices: [{ message: { content: '{"skillNames":[]}' } }] };
+        },
+      },
+    },
+  };
+  const manager = createMockedClientSessionManagerWithClient(workspace, client);
+  (manager as any).activateSession = async () => {};
+
+  await manager.createSession({ text: "pick the right workflow" });
+
+  const messages = (requests[0]?.messages ?? []) as Array<{ role?: string; content?: string }>;
+  assert.equal(messages[0]?.role, "system");
+  assert.match(messages[0]?.content ?? "", /<agent-instructions>/);
+  assert.match(messages[0]?.content ?? "", /prefer project-specific skill matching/);
+  assert.match(messages[0]?.content ?? "", /<\/agent-instructions>/);
+  assert.match(messages[0]?.content ?? "", /The candidate skills are as follows/);
+  assert.equal(messages[1]?.role, "user");
+});
+
+test("replySession includes current agent instructions in the skill matching system prompt", async () => {
+  const workspace = createTempDir("deepcode-skill-match-reply-workspace-");
+  const home = createTempDir("deepcode-skill-match-reply-home-");
+  setHomeDir(home);
+  globalThis.fetch = (async () => ({ ok: true, text: async () => "" }) as Response) as typeof fetch;
+
+  const requests: any[] = [];
+  const client = {
+    chat: {
+      completions: {
+        create: async (request: any) => {
+          requests.push(request);
+          return { choices: [{ message: { content: '{"skillNames":[]}' } }] };
+        },
+      },
+    },
+  };
+  const manager = createMockedClientSessionManagerWithClient(workspace, client);
+  (manager as any).activateSession = async () => {};
+
+  const sessionId = await manager.createSession({ text: "" });
+  fs.writeFileSync(path.join(workspace, "AGENTS.md"), "use reply-time agent instructions", "utf8");
+  const skillDir = path.join(workspace, ".agents", "skills", "reply-aware");
+  fs.mkdirSync(skillDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(skillDir, "SKILL.md"),
+    "---\nname: reply-aware\ndescription: Match reply-time instructions\n---\n# Reply Aware\n",
+    "utf8"
+  );
+
+  await manager.replySession(sessionId, { text: "pick the reply workflow" });
+
+  const messages = (requests[0]?.messages ?? []) as Array<{ role?: string; content?: string }>;
+  assert.equal(messages[0]?.role, "system");
+  assert.match(messages[0]?.content ?? "", /<agent-instructions>/);
+  assert.match(messages[0]?.content ?? "", /use reply-time agent instructions/);
+  assert.match(messages[0]?.content ?? "", /<\/agent-instructions>/);
+  assert.match(messages[0]?.content ?? "", /The candidate skills are as follows/);
+  assert.equal(messages[1]?.role, "user");
+});
+
 test("replySession stores /init and sends the active root project AGENTS path to the LLM", async () => {
   const workspace = createTempDir("deepcode-init-root-workspace-");
   const home = createTempDir("deepcode-init-root-home-");