Skip to content

Commit 0dffb96

Browse files
authored
fix(core): ask external_directory before session_move leaves the project (#62204)
1 parent 24008ab commit 0dffb96

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

‎packages/core/src/tool/plugin/opencode.ts‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type { SessionHooks } from "@opencode/plugin/effect/session"
66
import { Model } from "@opencode/schema/model"
77
import { AbsolutePath } from "@opencode/schema/schema"
88
import { Session } from "@opencode/schema/session"
9+
import { FSUtil } from "@opencode/util/fs-util"
910
import { Effect, Schema } from "effect"
1011
import { toolFailure } from "../runtime.js"
1112
import { FileAccess } from "../../file-access.js"
@@ -145,14 +146,26 @@ export const Plugin = {
145146
execute: (input, context) =>
146147
Effect.gen(function* () {
147148
const sessionID = input.sessionID ?? context.sessionID
149+
const session = yield* ctx.session.get({ sessionID })
150+
const directory = AbsolutePath.make(
151+
FileAccess.resolvePath(session.location.directory, input.directory.trim()),
152+
)
153+
// The destination becomes the session's internal directory, so leaving the project
154+
// needs the same approval as reaching outside it. The project's own worktrees don't.
155+
const target = yield* access.resolve({ path: directory, kind: "directory" })
156+
const worktrees = target.externalDirectory
157+
? yield* ctx.worktree.list({ projectID: ctx.location.project.id })
158+
: []
159+
if (!worktrees.some((worktree) => FSUtil.contains(worktree.directory, directory)))
160+
yield* access.authorizeExternal([target], context)
148161
yield* ctx.session.move({
149162
sessionID,
150-
directory: input.directory,
163+
directory,
151164
delivery: "steer",
152165
})
153166
return {
154-
output: { sessionID, directory: input.directory },
155-
content: `Moved session ${sessionID} to ${input.directory}.`,
167+
output: { sessionID, directory },
168+
content: `Moved session ${sessionID} to ${directory}.`,
156169
}
157170
}).pipe(
158171
Effect.mapError(

‎services/www/src/docs/content/tools.mdx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ The `opencode` Code Mode namespace contains session utilities:
253253
Rename this session to "Timeout cleanup", then move it to the new worktree.
254254
```
255255

256-
These utilities do not request a built-in permission action.
257-
258256
### Worktrees
259257

260258
The same namespace manages worktrees for the session's project:

0 commit comments

Comments
 (0)