refactor: keep runtime context in memory

.opencode/tools/memory_manager.ts

@@ -1,13 +1,12 @@
 import { tool } from "@opencode-ai/plugin";
 import { MemoryStore } from "../../src/memory/store.js";
-import { SessionRuntimeContextStore } from "../../src/sessions/runtimeContextStore.js";
+import {
+  getRuntimeSessionContext,
+  setRuntimeSessionContext,
+} from "../../src/runtime/sessionContext.js";
 
 const memoryStore = new MemoryStore();
-const toolContextStore = new SessionRuntimeContextStore();
-const initializePromise = Promise.all([
-  memoryStore.initialize(),
-  toolContextStore.initialize(),
-]);
+const initializePromise = memoryStore.initialize();
 
 export default tool({
   description:
@@ -37,7 +36,7 @@ export default tool({
   },
   async execute(args, context) {
     await initializePromise;
-    const sessionContext = await toolContextStore.read(context.sessionID);
+    const sessionContext = getRuntimeSessionContext(context.sessionID);
     if (!sessionContext) {
       throw new Error(`session context not found for ${context.sessionID}`);
     }
@@ -57,10 +56,10 @@ export default tool({
     }
     if (sessionContext.allowLearningWrite === false && args.action !== "list") {
       return JSON.stringify({
-      ok: true,
-      kind: "memory",
-      decision: "rejected",
-      detail: "memory writes are disabled for this session",
+        ok: true,
+        kind: "memory",
+        decision: "rejected",
+        detail: "memory writes are disabled for this session",
       });
     }
 
@@ -71,17 +70,17 @@ export default tool({
         ...(sessionContext.memoryListReadScopes ?? {}),
         [scope]: true,
       };
-      await toolContextStore.write({
+      setRuntimeSessionContext({
         ...sessionContext,
         memoryListReadScopes: readScopes,
       });
       return JSON.stringify({
-      ok: true,
-      kind: "memory",
-      decision: "accepted",
-      detail: "memory listed",
-      items: await memoryStore.list(scope, scopeKey),
-      target: scope,
+        ok: true,
+        kind: "memory",
+        decision: "accepted",
+        detail: "memory listed",
+        items: await memoryStore.list(scope, scopeKey),
+        target: scope,
       });
     }
 
@@ -96,46 +95,55 @@ export default tool({
         });
       }
       const result = await memoryStore.upsert(scope, scopeKey, {
-      content: args.content ?? "",
-      sessionId: sessionContext.clientSessionId,
-      source: "tool",
-      traceId: sessionContext.traceId,
+        content: args.content ?? "",
+        sessionId: sessionContext.clientSessionId,
+        source: "tool",
+        traceId: sessionContext.traceId,
       });
       if (!result.entry) {
+        return JSON.stringify({
+          ok: true,
+          kind: "memory",
+          decision: "rejected",
+          detail: "content rejected by persistence policy",
+        });
+      }
       return JSON.stringify({
         ok: true,
         kind: "memory",
-        decision: "rejected",
-        detail: "content rejected by persistence policy",
-      });
-      }
-      return JSON.stringify({
-      ok: true,
-      kind: "memory",
-      decision: result.changed ? "accepted" : "deduped",
-      detail: result.detail,
-      entry: result.entry,
-      target: scope,
+        decision: result.changed ? "accepted" : "deduped",
+        detail: result.detail,
+        entry: result.entry,
+        target: scope,
       });
     }
 
     if (args.action === "replace") {
-      const result = await memoryStore.replace(scope, scopeKey, args.target_id ?? "", {
-      content: args.content ?? "",
-      sessionId: sessionContext.clientSessionId,
-      source: "tool",
-      traceId: sessionContext.traceId,
-      });
+      const result = await memoryStore.replace(
+        scope,
+        scopeKey,
+        args.target_id ?? "",
+        {
+          content: args.content ?? "",
+          sessionId: sessionContext.clientSessionId,
+          source: "tool",
+          traceId: sessionContext.traceId,
+        },
+      );
       return JSON.stringify({
-      ok: true,
-      kind: "memory",
-      decision: result.changed ? "accepted" : "rejected",
-      detail: result.detail,
-      target: scope,
+        ok: true,
+        kind: "memory",
+        decision: result.changed ? "accepted" : "rejected",
+        detail: result.detail,
+        target: scope,
       });
     }
 
-    const result = await memoryStore.remove(scope, scopeKey, args.target_id ?? "");
+    const result = await memoryStore.remove(
+      scope,
+      scopeKey,
+      args.target_id ?? "",
+    );
     return JSON.stringify({
       ok: true,
       kind: "memory",

.opencode/tools/skill_manager.ts

@@ -1,123 +1,154 @@
 import { tool } from "@opencode-ai/plugin";
 
 import { SkillStore } from "../../src/skills/store.js";
-import { SessionRuntimeContextStore } from "../../src/sessions/runtimeContextStore.js";
+import {
+  getRuntimeSessionContext,
+  type RuntimeSessionContext,
+} from "../../src/runtime/sessionContext.js";
+
+type ToolContextReader = {
+  read(sessionId: string): RuntimeSessionContext | null;
+};
+
+const runtimeContextReader: ToolContextReader = {
+  read: getRuntimeSessionContext,
+};
 
 export const createSkillManagerTool = (
   skillStore = new SkillStore(),
-  toolContextStore = new SessionRuntimeContextStore(),
-  initializePromise: Promise<unknown> = toolContextStore.initialize(),
-) => tool({
-  description:
-    "维护已验证、可复用、非敏感的 workflow 或方法模式。支持 list、write_skill、remove_skill、append_pattern、remove_pattern、write_reference、remove_reference、write_script、remove_script。",
-  args: {
-    action: tool.schema
-      .enum([
-        "list",
-        "write_skill",
-        "remove_skill",
-        "append_pattern",
-        "remove_pattern",
-        "write_reference",
-        "remove_reference",
-        "write_script",
-        "remove_script",
-      ])
-      .describe("Skill maintenance operation."),
-    reason: tool.schema
-      .string()
-      .describe(
-        "Why this skill maintenance action is justified for future reuse.",
-      ),
-    skill_path: tool.schema
-      .string()
-      .describe(
-        "Target skill directory path relative to .opencode/skills. Use 'workflow' for the workflow index, or '__root__' for the root skills index.",
-      ),
-    pattern: tool.schema
-      .string()
-      .optional()
-      .describe("Pattern text used by append_pattern."),
-    target_id: tool.schema
-      .string()
-      .optional()
-      .describe("Stable learned pattern id used by remove_pattern."),
-    file_path: tool.schema
-      .string()
-      .optional()
-      .describe("Asset file path. For references use references/*.md; for scripts use scripts/*.py."),
-    content: tool.schema
-      .string()
-      .optional()
-      .describe("Content used by write_skill, write_reference, or write_script."),
-  },
-  async execute(args, context) {
-    await initializePromise;
-    const sessionContext = await toolContextStore.read(context.sessionID);
-    if (!sessionContext) {
-      throw new Error(`session context not found for ${context.sessionID}`);
-    }
-    if (sessionContext.allowLearningWrite === false && args.action !== "list") {
-      return JSON.stringify({
-        ok: true,
-        kind: "skill",
-        decision: "rejected",
-        detail: "skill writes are disabled for this session",
-      });
-    }
-    if (args.action === "list") {
-      const result = await skillStore.list(args.skill_path);
-      if (!result) {
+  toolContextStore: ToolContextReader = runtimeContextReader,
+  initializePromise: Promise<unknown> = Promise.resolve(),
+) =>
+  tool({
+    description:
+      "维护已验证、可复用、非敏感的 workflow 或方法模式。支持 list、write_skill、remove_skill、append_pattern、remove_pattern、write_reference、remove_reference、write_script、remove_script。",
+    args: {
+      action: tool.schema
+        .enum([
+          "list",
+          "write_skill",
+          "remove_skill",
+          "append_pattern",
+          "remove_pattern",
+          "write_reference",
+          "remove_reference",
+          "write_script",
+          "remove_script",
+        ])
+        .describe("Skill maintenance operation."),
+      reason: tool.schema
+        .string()
+        .describe(
+          "Why this skill maintenance action is justified for future reuse.",
+        ),
+      skill_path: tool.schema
+        .string()
+        .describe(
+          "Target skill directory path relative to .opencode/skills. Use 'workflow' for the workflow index, or '__root__' for the root skills index.",
+        ),
+      pattern: tool.schema
+        .string()
+        .optional()
+        .describe("Pattern text used by append_pattern."),
+      target_id: tool.schema
+        .string()
+        .optional()
+        .describe("Stable learned pattern id used by remove_pattern."),
+      file_path: tool.schema
+        .string()
+        .optional()
+        .describe(
+          "Asset file path. For references use references/*.md; for scripts use scripts/*.py.",
+        ),
+      content: tool.schema
+        .string()
+        .optional()
+        .describe(
+          "Content used by write_skill, write_reference, or write_script.",
+        ),
+    },
+    async execute(args, context) {
+      await initializePromise;
+      const sessionContext = toolContextStore.read(context.sessionID);
+      if (!sessionContext) {
+        throw new Error(`session context not found for ${context.sessionID}`);
+      }
+      if (
+        sessionContext.allowLearningWrite === false &&
+        args.action !== "list"
+      ) {
         return JSON.stringify({
           ok: true,
           kind: "skill",
           decision: "rejected",
-          detail:
-            "invalid skill_path; expected a relative path under .opencode/skills",
+          detail: "skill writes are disabled for this session",
         });
       }
+      if (args.action === "list") {
+        const result = await skillStore.list(args.skill_path);
+        if (!result) {
+          return JSON.stringify({
+            ok: true,
+            kind: "skill",
+            decision: "rejected",
+            detail:
+              "invalid skill_path; expected a relative path under .opencode/skills",
+          });
+        }
+        return JSON.stringify({
+          ok: true,
+          kind: "skill",
+          decision: "accepted",
+          detail: "skill listed",
+          ...result,
+        });
+      }
+
+      const result =
+        args.action === "write_skill"
+          ? await skillStore.writeSkill(args.skill_path, args.content ?? "")
+          : args.action === "remove_skill"
+            ? await skillStore.removeSkill(args.skill_path)
+            : args.action === "append_pattern"
+              ? await skillStore.appendPattern(
+                  args.skill_path,
+                  args.pattern ?? "",
+                )
+              : args.action === "remove_pattern"
+                ? await skillStore.removePattern(
+                    args.skill_path,
+                    args.target_id ?? "",
+                  )
+                : args.action === "write_reference"
+                  ? await skillStore.writeReference(
+                      args.skill_path,
+                      args.file_path ?? "",
+                      args.content ?? "",
+                    )
+                  : args.action === "remove_reference"
+                    ? await skillStore.removeReference(
+                        args.skill_path,
+                        args.file_path ?? "",
+                      )
+                    : args.action === "write_script"
+                      ? await skillStore.writeScript(
+                          args.skill_path,
+                          args.file_path ?? "",
+                          args.content ?? "",
+                        )
+                      : await skillStore.removeScript(
+                          args.skill_path,
+                          args.file_path ?? "",
+                        );
+
       return JSON.stringify({
         ok: true,
         kind: "skill",
-        decision: "accepted",
-        detail: "skill listed",
-        ...result,
+        decision: result.changed ? "accepted" : "rejected",
+        detail: result.detail,
+        target: result.target,
       });
-    }
-
-    const result =
-      args.action === "write_skill"
-        ? await skillStore.writeSkill(args.skill_path, args.content ?? "")
-        : args.action === "remove_skill"
-          ? await skillStore.removeSkill(args.skill_path)
-          : args.action === "append_pattern"
-            ? await skillStore.appendPattern(args.skill_path, args.pattern ?? "")
-            : args.action === "remove_pattern"
-              ? await skillStore.removePattern(args.skill_path, args.target_id ?? "")
-              : args.action === "write_reference"
-                ? await skillStore.writeReference(
-                    args.skill_path,
-                    args.file_path ?? "",
-                    args.content ?? "",
-                  )
-                : args.action === "remove_reference"
-                  ? await skillStore.removeReference(args.skill_path, args.file_path ?? "")
-                  : args.action === "write_script"
-                    ? await skillStore.writeScript(
-                        args.skill_path,
-                        args.file_path ?? "",
-                        args.content ?? "",
-                      )
-                    : await skillStore.removeScript(args.skill_path, args.file_path ?? "");
-
-    return JSON.stringify({
-      ok: true,
-      kind: "skill",
-      decision: result.changed ? "accepted" : "rejected",
-      detail: result.detail,
-      target: result.target,
-    });
-  },
-});
+    },
+  });
 
 export default createSkillManagerTool();