Skip to content

fix(session): inject directory into session API calls for worktree support #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gburch wants to merge 8 commits into
base: dev
Choose a base branch
from
+291 −43
Open

fix(session): inject directory into session API calls for worktree support #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05d00c8
fix(session): inject directory into session API calls for worktree su…
gburch Feb 2, 2026
3788cff
Merge branch 'dev' into fix/worktree-directory-injection
gburch Feb 2, 2026
b4f2d61
Merge branch 'dev' into fix/worktree-directory-injection
gburch Feb 3, 2026
7ca8850
Merge branch 'dev' into fix/worktree-directory-injection
gburch Feb 3, 2026
287e463
Merge remote-tracking branch 'origin/dev' into fix/worktree-directory…
gburch Feb 4, 2026
a108edc
Merge remote-tracking branch 'origin/dev' into fix/worktree-directory…
gburch Feb 5, 2026
9d193bb
Merge remote-tracking branch 'origin/dev' into fix/worktree-directory…
gburch Feb 5, 2026
c717c40
fix(session): bind directory without mutating client
gburch Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 53 additions & 43 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ import {
isOpenCodeVersionAtLeast,
OPENCODE_NATIVE_AGENTS_INJECTION_VERSION,
injectServerAuthIntoClient,
createDirectoryBoundClient,
} from "./shared";
import { loadPluginConfig } from "./plugin-config";
import { createModelCacheState } from "./plugin-state";
Expand All @@ -110,10 +111,16 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
directory: ctx.directory,
});
injectServerAuthIntoClient(ctx.client);

const ctxWithDirectory = {
...ctx,
client: createDirectoryBoundClient(ctx.client, ctx.directory),
};

// Start background tmux check immediately
startTmuxCheck();

const pluginConfig = loadPluginConfig(ctx.directory, ctx);
const pluginConfig = loadPluginConfig(ctxWithDirectory.directory, ctxWithDirectory);
const disabledHooks = new Set(pluginConfig.disabled_hooks ?? []);
const firstMessageVariantGate = createFirstMessageVariantGate();

Expand All @@ -129,15 +136,15 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
const modelCacheState = createModelCacheState();

const contextWindowMonitor = isHookEnabled("context-window-monitor")
? createContextWindowMonitorHook(ctx)
? createContextWindowMonitorHook(ctxWithDirectory)
: null;
const preemptiveCompaction =
isHookEnabled("preemptive-compaction") &&
pluginConfig.experimental?.preemptive_compaction
? createPreemptiveCompactionHook(ctx)
? createPreemptiveCompactionHook(ctxWithDirectory)
: null;
const sessionRecovery = isHookEnabled("session-recovery")
? createSessionRecoveryHook(ctx, {
? createSessionRecoveryHook(ctxWithDirectory, {
experimental: pluginConfig.experimental,
})
: null;
Expand All @@ -156,15 +163,15 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
allPlugins: externalNotifier.allPlugins,
});
} else {
sessionNotification = createSessionNotification(ctx);
sessionNotification = createSessionNotification(ctxWithDirectory);
}
}

const commentChecker = isHookEnabled("comment-checker")
? createCommentCheckerHooks(pluginConfig.comment_checker)
: null;
const toolOutputTruncator = isHookEnabled("tool-output-truncator")
? createToolOutputTruncatorHook(ctx, {
? createToolOutputTruncatorHook(ctxWithDirectory, {
experimental: pluginConfig.experimental,
})
: null;
Expand All @@ -185,20 +192,20 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
},
);
} else {
directoryAgentsInjector = createDirectoryAgentsInjectorHook(ctx);
directoryAgentsInjector = createDirectoryAgentsInjectorHook(ctxWithDirectory);
}
}
const directoryReadmeInjector = isHookEnabled("directory-readme-injector")
? createDirectoryReadmeInjectorHook(ctx)
? createDirectoryReadmeInjectorHook(ctxWithDirectory)
: null;
const emptyTaskResponseDetector = isHookEnabled(
"empty-task-response-detector",
)
? createEmptyTaskResponseDetectorHook(ctx)
? createEmptyTaskResponseDetectorHook(ctxWithDirectory)
: null;
const thinkMode = isHookEnabled("think-mode") ? createThinkModeHook() : null;
const claudeCodeHooks = createClaudeCodeHooksHook(
ctx,
ctxWithDirectory,
{
disabledHooks:
(pluginConfig.claude_code?.hooks ?? true) ? undefined : true,
Expand All @@ -209,68 +216,68 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
const anthropicContextWindowLimitRecovery = isHookEnabled(
"anthropic-context-window-limit-recovery",
)
? createAnthropicContextWindowLimitRecoveryHook(ctx, {
? createAnthropicContextWindowLimitRecoveryHook(ctxWithDirectory, {
experimental: pluginConfig.experimental,
})
: null;
const rulesInjector = isHookEnabled("rules-injector")
? createRulesInjectorHook(ctx)
? createRulesInjectorHook(ctxWithDirectory)
: null;
const autoUpdateChecker = isHookEnabled("auto-update-checker")
? createAutoUpdateCheckerHook(ctx, {
? createAutoUpdateCheckerHook(ctxWithDirectory, {
showStartupToast: isHookEnabled("startup-toast"),
isSisyphusEnabled: pluginConfig.sisyphus_agent?.disabled !== true,
autoUpdate: pluginConfig.auto_update ?? true,
})
: null;
const keywordDetector = isHookEnabled("keyword-detector")
? createKeywordDetectorHook(ctx, contextCollector)
? createKeywordDetectorHook(ctxWithDirectory, contextCollector)
: null;
const contextInjectorMessagesTransform =
createContextInjectorMessagesTransformHook(contextCollector);
const agentUsageReminder = isHookEnabled("agent-usage-reminder")
? createAgentUsageReminderHook(ctx)
? createAgentUsageReminderHook(ctxWithDirectory)
: null;
const nonInteractiveEnv = isHookEnabled("non-interactive-env")
? createNonInteractiveEnvHook(ctx)
? createNonInteractiveEnvHook(ctxWithDirectory)
: null;
const interactiveBashSession = isHookEnabled("interactive-bash-session")
? createInteractiveBashSessionHook(ctx)
? createInteractiveBashSessionHook(ctxWithDirectory)
: null;

const thinkingBlockValidator = isHookEnabled("thinking-block-validator")
? createThinkingBlockValidatorHook()
: null;

const categorySkillReminder = isHookEnabled("category-skill-reminder")
? createCategorySkillReminderHook(ctx)
? createCategorySkillReminderHook(ctxWithDirectory)
: null;

const ralphLoop = isHookEnabled("ralph-loop")
? createRalphLoopHook(ctx, {
? createRalphLoopHook(ctxWithDirectory, {
config: pluginConfig.ralph_loop,
checkSessionExists: async (sessionId) => sessionExists(sessionId),
})
: null;

const editErrorRecovery = isHookEnabled("edit-error-recovery")
? createEditErrorRecoveryHook(ctx)
? createEditErrorRecoveryHook(ctxWithDirectory)
: null;

const delegateTaskRetry = isHookEnabled("delegate-task-retry")
? createDelegateTaskRetryHook(ctx)
? createDelegateTaskRetryHook(ctxWithDirectory)
: null;

const startWork = isHookEnabled("start-work")
? createStartWorkHook(ctx)
? createStartWorkHook(ctxWithDirectory)
: null;

const prometheusMdOnly = isHookEnabled("prometheus-md-only")
? createPrometheusMdOnlyHook(ctx)
? createPrometheusMdOnlyHook(ctxWithDirectory)
: null;

const sisyphusJuniorNotepad = isHookEnabled("sisyphus-junior-notepad")
? createSisyphusJuniorNotepadHook(ctx)
? createSisyphusJuniorNotepadHook(ctxWithDirectory)
: null;

const tasksTodowriteDisabler = isHookEnabled("tasks-todowrite-disabler")
Expand All @@ -282,15 +289,15 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
const questionLabelTruncator = createQuestionLabelTruncatorHook();
const subagentQuestionBlocker = createSubagentQuestionBlockerHook();
const writeExistingFileGuard = isHookEnabled("write-existing-file-guard")
? createWriteExistingFileGuardHook(ctx)
? createWriteExistingFileGuardHook(ctxWithDirectory)
: null;

const taskResumeInfo = createTaskResumeInfoHook();

const tmuxSessionManager = new TmuxSessionManager(ctx, tmuxConfig);
const tmuxSessionManager = new TmuxSessionManager(ctxWithDirectory, tmuxConfig);

const backgroundManager = new BackgroundManager(
ctx,
ctxWithDirectory,
pluginConfig.background_task,
{
tmuxConfig,
Expand Down Expand Up @@ -321,21 +328,21 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
);

const atlasHook = isHookEnabled("atlas")
? createAtlasHook(ctx, { directory: ctx.directory, backgroundManager })
? createAtlasHook(ctxWithDirectory, { directory: ctx.directory, backgroundManager })
: null;

initTaskToastManager(ctx.client);
initTaskToastManager(ctxWithDirectory.client);

const stopContinuationGuard = isHookEnabled("stop-continuation-guard")
? createStopContinuationGuardHook(ctx)
? createStopContinuationGuardHook(ctxWithDirectory)
: null;

const compactionContextInjector = isHookEnabled("compaction-context-injector")
? createCompactionContextInjector()
: null;

const todoContinuationEnforcer = isHookEnabled("todo-continuation-enforcer")
? createTodoContinuationEnforcer(ctx, {
? createTodoContinuationEnforcer(ctxWithDirectory, {
backgroundManager,
isContinuationStopped: stopContinuationGuard?.isStopped,
})
Expand All @@ -348,7 +355,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
client: {
session: {
messages: async (args) => {
const result = await ctx.client.session.messages(args);
const result = await ctxWithDirectory.client.session.messages(args);
if (Array.isArray(result)) return result;
if (
typeof result === "object" &&
Expand All @@ -361,7 +368,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
return [];
},
prompt: async (args) => {
await ctx.client.session.prompt(args);
await ctxWithDirectory.client.session.prompt(args);
},
},
},
Expand All @@ -383,19 +390,22 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
const backgroundNotificationHook = isHookEnabled("background-notification")
? createBackgroundNotificationHook(backgroundManager)
: null;
const backgroundTools = createBackgroundTools(backgroundManager, ctx.client);
const backgroundTools = createBackgroundTools(
backgroundManager,
ctxWithDirectory.client,
);

const callOmoAgent = createCallOmoAgent(ctx, backgroundManager);
const callOmoAgent = createCallOmoAgent(ctxWithDirectory, backgroundManager);
const isMultimodalLookerEnabled = !(pluginConfig.disabled_agents ?? []).some(
(agent) => agent.toLowerCase() === "multimodal-looker",
);
const lookAt = isMultimodalLookerEnabled ? createLookAt(ctx) : null;
const lookAt = isMultimodalLookerEnabled ? createLookAt(ctxWithDirectory) : null;
const browserProvider =
pluginConfig.browser_automation_engine?.provider ?? "playwright";
const disabledSkills = new Set<string>(pluginConfig.disabled_skills ?? []);
const delegateTask = createDelegateTask({
manager: backgroundManager,
client: ctx.client,
client: ctxWithDirectory.client,
directory: ctx.directory,
userCategories: pluginConfig.categories,
gitMasterConfig: pluginConfig.git_master,
Expand Down Expand Up @@ -472,18 +482,18 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
: null;

const configHandler = createConfigHandler({
ctx: { directory: ctx.directory, client: ctx.client },
ctx: { directory: ctxWithDirectory.directory, client: ctxWithDirectory.client },
pluginConfig,
modelCacheState,
});

const taskSystemEnabled = pluginConfig.experimental?.task_system ?? false;
const taskToolsRecord: Record<string, ToolDefinition> = taskSystemEnabled
? {
task_create: createTaskCreateTool(pluginConfig, ctx),
task_create: createTaskCreateTool(pluginConfig, ctxWithDirectory),
task_get: createTaskGetTool(pluginConfig),
task_list: createTaskList(pluginConfig),
task_update: createTaskUpdateTool(pluginConfig, ctx),
task_update: createTaskUpdateTool(pluginConfig, ctxWithDirectory),
}
: {};

Expand Down Expand Up @@ -538,7 +548,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
await startWork?.["chat.message"]?.(input, output);

if (!hasConnectedProvidersCache()) {
ctx.client.tui
ctxWithDirectory.client.tui
.showToast({
body: {
title: "⚠️ Provider Cache Missing",
Expand Down Expand Up @@ -710,11 +720,11 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
sessionID === getMainSessionID() &&
!stopContinuationGuard?.isStopped(sessionID)
) {
await ctx.client.session
await ctxWithDirectory.client.session
.prompt({
path: { id: sessionID },
body: { parts: [{ type: "text", text: "continue" }] },
query: { directory: ctx.directory },
query: { directory: ctxWithDirectory.directory },
})
.catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ export * from "./tmux"
export * from "./model-suggestion-retry"
export * from "./opencode-server-auth"
export * from "./port-utils"
export * from "./session-directory-injection"
Loading