@dlacaille/opencode-copilot-instructions 0.2.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dlacaille/opencode-copilot-instructions",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "OpenCode plugin that loads GitHub Copilot custom instruction files",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -25,7 +25,25 @@ function getRepoRelativePath(
     path.isAbsolute(relative)
   )
     return null;
-  return relative;
+  return relative.split(path.sep).join("/");
+}
+
+function appendInstructions<Content>(
+  result: { content?: string | ReadonlyArray<Content>; output?: unknown },
+  text: string,
+): string | ReadonlyArray<Content | { type: "text"; text: string }> {
+  const { content, output } = result;
+  if (Array.isArray(content)) return [...content, { type: "text", text }];
+  // Without content, the model would otherwise see only the output, so keep it in the text.
+  const existing =
+    typeof content === "string"
+      ? content
+      : output === undefined
+        ? ""
+        : typeof output === "string"
+          ? output
+          : JSON.stringify(output, null, 2);
+  return existing ? `${existing}\n\n${text}` : text;
 }
 
 export default Plugin.define({
@@ -82,9 +100,6 @@ export default Plugin.define({
       });
       if (matching.length === 0) return;
 
-      for (const instruction of matching)
-        state.markFileInjected(event.sessionID, instruction.file);
-
       const text = matching
         .map((instruction) => {
           const filename = path.basename(instruction.file);
@@ -93,19 +108,23 @@ export default Plugin.define({
         })
         .join("\n\n");
 
-      state.setPending(event.id, text);
+      state.setPending(event.id, {
+        sessionId: event.sessionID,
+        files: matching.map((instruction) => instruction.file),
+        text,
+      });
     });
 
     await ctx.tool.hook("execute.after", (event) => {
-      const text = state.consumePending(event.id);
-      if (!text) return;
+      const pending = state.consumePending(event.id);
+      if (!pending) return;
       if (event.status !== "completed") return;
 
-      const existing =
-        typeof event.result.content === "string" ? event.result.content : "";
+      for (const file of pending.files)
+        state.markFileInjected(pending.sessionId, file);
       event.result = {
         ...event.result,
-        content: existing ? `${existing}\n\n${text}` : text,
+        content: appendInstructions(event.result, pending.text),
       };
     });
 

package/src/matcher.ts

@@ -4,7 +4,7 @@ export type Matcher = (path: string) => boolean;
 
 export function createMatcher(patterns: string[]): Matcher {
   if (patterns.length === 0) return () => false;
-  const isMatch = picomatch(patterns);
+  const isMatch = picomatch(patterns, { dot: true });
   return (path) => isMatch(path);
 }
 

package/src/session-state.ts

@@ -4,9 +4,15 @@
  * Tracks which path-specific instructions have been injected per session, and
  * pending instructions keyed by tool call ID.
  */
+export interface PendingInstructions {
+  sessionId: string;
+  files: string[];
+  text: string;
+}
+
 export class SessionState {
   private injectedPerSession = new Map<string, Set<string>>();
-  private pendingInstructions = new Map<string, string>();
+  private pendingInstructions = new Map<string, PendingInstructions>();
 
   isFileInjected(sessionId: string, file: string): boolean {
     return this.injectedPerSession.get(sessionId)?.has(file) ?? false;
@@ -23,15 +29,19 @@ export class SessionState {
 
   clearSession(sessionId: string): void {
     this.injectedPerSession.delete(sessionId);
+    for (const [callId, pending] of this.pendingInstructions) {
+      if (pending.sessionId === sessionId)
+        this.pendingInstructions.delete(callId);
+    }
   }
 
-  setPending(callId: string, text: string): void {
-    this.pendingInstructions.set(callId, text);
+  setPending(callId: string, pending: PendingInstructions): void {
+    this.pendingInstructions.set(callId, pending);
   }
 
-  consumePending(callId: string): string | undefined {
-    const text = this.pendingInstructions.get(callId);
+  consumePending(callId: string): PendingInstructions | undefined {
+    const pending = this.pendingInstructions.get(callId);
     this.pendingInstructions.delete(callId);
-    return text;
+    return pending;
   }
 }