Skip to content

Guard OpenCode session-start hook on duplicate session.created #824

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
sanogueralorenzo wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Guard OpenCode session-start hook on duplicate session.created #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a73a14
Fix duplicate OpenCode session-start hooks
sanogueralorenzo Apr 1, 2026
a9522ad
Drop unnecessary strconv in OpenCode hook test
sanogueralorenzo Apr 1, 2026
eaa60d7
Merge branch 'main' into sanogueralorenzo/fix-opencode-session-start
sanogueralorenzo Apr 2, 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
6 changes: 3 additions & 3 deletions cmd/entire/cli/agent/opencode/entire_plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ export const EntirePlugin: Plugin = async ({ directory }) => {
seenUserMessages.clear()
messageStore.clear()
currentModel = null
await callHook("session-start", {
session_id: session.id,
})
}
currentSessionID = session.id
await callHook("session-start", {
session_id: session.id,
})
break
}

Expand Down
39 changes: 39 additions & 0 deletions cmd/entire/cli/agent/opencode/hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,45 @@ func TestInstallHooks_LocalDev(t *testing.T) {
}
}

func TestInstallHooks_SessionStartIsGuardedBySessionSwitch(t *testing.T) {
dir := t.TempDir()
t.Chdir(dir)
ag := &OpenCodeAgent{}

if _, err := ag.InstallHooks(context.Background(), false, false); err != nil {
t.Fatalf("install failed: %v", err)
}

pluginPath := filepath.Join(dir, ".opencode", "plugins", "entire.ts")
data, err := os.ReadFile(pluginPath)
if err != nil {
t.Fatalf("plugin file not created: %v", err)
}

content := string(data)
guard := "if (currentSessionID !== session.id) {"
hook := `await callHook("session-start", {`
currentSessionAssignment := "currentSessionID = session.id"

guardIdx := strings.Index(content, guard)
hookIdx := strings.Index(content, hook)
assignIdx := strings.Index(content, currentSessionAssignment)

if guardIdx == -1 {
t.Fatalf("plugin file missing guard %q", guard)
}
if hookIdx == -1 {
t.Fatalf("plugin file missing session-start hook call %q", hook)
}
if assignIdx == -1 {
t.Fatalf("plugin file missing current session assignment %q", currentSessionAssignment)
}
if !(guardIdx < hookIdx && hookIdx < assignIdx) {
t.Fatalf("expected guarded session-start call before session assignment, got guard=%d hook=%d assignment=%d",
guardIdx, hookIdx, assignIdx)
}
}

func TestInstallHooks_ForceReinstall(t *testing.T) {
dir := t.TempDir()
t.Chdir(dir)
Expand Down