refactor: reorganize lib/ into core/, state/, api-formats/, ui/ subdirectories

Author: Tarquinen

index.ts

@@ -1,14 +1,14 @@
 import type { Plugin } from "@opencode-ai/plugin"
 import { getConfig } from "./lib/config"
 import { Logger } from "./lib/logger"
-import { createJanitorContext } from "./lib/janitor"
+import { createJanitorContext } from "./lib/core/janitor"
 import { checkForUpdates } from "./lib/version-checker"
 import { createPluginState } from "./lib/state"
 import { installFetchWrapper } from "./lib/fetch-wrapper"
 import { createPruningTool } from "./lib/pruning-tool"
 import { createEventHandler, createChatParamsHandler } from "./lib/hooks"
-import { createToolTracker } from "./lib/synth-instruction"
-import { loadPrompt } from "./lib/prompt"
+import { createToolTracker } from "./lib/api-formats/synth-instruction"
+import { loadPrompt } from "./lib/core/prompt"
 
 const plugin: Plugin = (async (ctx) => {
     const { config, migrations } = getConfig(ctx)

lib/synth-instruction.ts lib/api-formats/synth-instruction.tslib/synth-instruction.ts renamed to lib/api-formats/synth-instruction.ts

@@ -1,4 +1,4 @@
-import { extractParameterKey } from "./display-utils"
+import { extractParameterKey } from "../ui/display-utils"
 
 export interface DuplicateDetectionResult {
     duplicateIds: string[]  // IDs to prune (older duplicates)

lib/deduplicator.ts lib/core/deduplicator.tslib/deduplicator.ts renamed to lib/core/deduplicator.ts

@@ -1,16 +1,16 @@
 import { z } from "zod"
-import type { Logger } from "./logger"
-import type { PruningStrategy } from "./config"
-import type { PluginState } from "./state"
+import type { Logger } from "../logger"
+import type { PruningStrategy } from "../config"
+import type { PluginState } from "../state"
 import { buildAnalysisPrompt } from "./prompt"
-import { selectModel, extractModelFromSession } from "./model-selector"
-import { estimateTokensBatch, formatTokenCount } from "./tokenizer"
-import { saveSessionState } from "./state-persistence"
-import { ensureSessionRestored } from "./state"
+import { selectModel, extractModelFromSession } from "../model-selector"
+import { estimateTokensBatch, formatTokenCount } from "../tokenizer"
+import { saveSessionState } from "../state/persistence"
+import { ensureSessionRestored } from "../state"
 import {
     sendPruningSummary,
     type NotificationContext
-} from "./notification"
+} from "../ui/notification"
 
 // ============================================================================
 // Types

lib/janitor.ts lib/core/janitor.tslib/janitor.ts renamed to lib/core/janitor.ts

@@ -2,7 +2,7 @@ import { readFileSync } from "fs"
 import { join } from "path"
 
 export function loadPrompt(name: string, vars?: Record<string, string>): string {
-    const filePath = join(__dirname, "prompts", `${name}.txt`)
+    const filePath = join(__dirname, "..", "prompts", `${name}.txt`)
     let content = readFileSync(filePath, "utf8").trim()
     if (vars) {
         for (const [key, value] of Object.entries(vars)) {

lib/prompt.ts lib/core/prompt.tslib/prompt.ts renamed to lib/core/prompt.ts

@@ -4,7 +4,7 @@ import {
     getAllPrunedIds,
     fetchSessionMessages
 } from "./types"
-import { injectNudgeGemini, injectSynthGemini } from "../synth-instruction"
+import { injectNudgeGemini, injectSynthGemini } from "../api-formats/synth-instruction"
 
 /**
  * Handles Google/Gemini format (body.contents array with functionResponse parts).

lib/fetch-wrapper/gemini.ts

@@ -1,12 +1,12 @@
 import type { PluginState } from "../state"
 import type { Logger } from "../logger"
 import type { FetchHandlerContext, SynthPrompts } from "./types"
-import type { ToolTracker } from "../synth-instruction"
+import type { ToolTracker } from "../api-formats/synth-instruction"
 import type { PluginConfig } from "../config"
 import { handleOpenAIChatAndAnthropic } from "./openai-chat"
 import { handleGemini } from "./gemini"
 import { handleOpenAIResponses } from "./openai-responses"
-import { detectDuplicates } from "../deduplicator"
+import { detectDuplicates } from "../core/deduplicator"
 
 export type { FetchHandlerContext, FetchHandlerResult, SynthPrompts } from "./types"
 

lib/fetch-wrapper/index.ts

@@ -5,8 +5,8 @@ import {
     fetchSessionMessages,
     getMostRecentActiveSession
 } from "./types"
-import { cacheToolParametersFromMessages } from "../tool-cache"
-import { injectNudge, injectSynth } from "../synth-instruction"
+import { cacheToolParametersFromMessages } from "../state/tool-cache"
+import { injectNudge, injectSynth } from "../api-formats/synth-instruction"
 
 /**
  * Handles OpenAI Chat Completions format (body.messages with role='tool').

lib/fetch-wrapper/openai-chat.ts

@@ -5,8 +5,8 @@ import {
     fetchSessionMessages,
     getMostRecentActiveSession
 } from "./types"
-import { cacheToolParametersFromInput } from "../tool-cache"
-import { injectNudgeResponses, injectSynthResponses } from "../synth-instruction"
+import { cacheToolParametersFromInput } from "../state/tool-cache"
+import { injectNudgeResponses, injectSynthResponses } from "../api-formats/synth-instruction"
 
 /**
  * Handles OpenAI Responses API format (body.input array with function_call_output items).

lib/fetch-wrapper/openai-responses.ts

@@ -1,6 +1,6 @@
 import { type PluginState, ensureSessionRestored } from "../state"
 import type { Logger } from "../logger"
-import type { ToolTracker } from "../synth-instruction"
+import type { ToolTracker } from "../api-formats/synth-instruction"
 import type { PluginConfig } from "../config"
 
 /** The message used to replace pruned tool output content */