Compare commits

..

1 Commits

Author SHA1 Message Date
Kit Langton a7288d231e feat(tui): add working directory actions (#42624) 2026-08-14 15:29:22 -04:00
8 changed files with 246 additions and 395 deletions
+1 -1
View File
@@ -171,7 +171,7 @@ export interface SlotMap {
readonly "prompt.footer.file": PromptFooterInput
readonly "session.composer.top": { readonly sessionID: string }
readonly "sidebar.content": { readonly sessionID: string }
readonly "sidebar.footer": Readonly<Record<string, never>>
readonly "sidebar.footer": { readonly sessionID: string }
}
export type SlotPath = keyof SlotMap
+125 -277
View File
@@ -4,10 +4,6 @@ import { Rpc, RpcGroup } from "effect/unstable/rpc"
const JsonRpcID = Schema.Union([Schema.String, Schema.Number, Schema.Null])
const decodeJson = Schema.decodeUnknownSync(Schema.Json)
// Generated schema unions lose mapped tuple types even though both come from the same operation tuple.
// eslint-disable-next-line typescript-eslint/no-unsafe-type-assertion, typescript-eslint/no-unnecessary-type-parameters
const decoded = <Type>(value: unknown) => value as Type
export namespace JsonRpc {
export const RequestFields = {
jsonrpc: Schema.Literal("2.0"),
@@ -26,33 +22,13 @@ export namespace JsonRpc {
data: Schema.optional(Schema.Json),
})
export type Response =
| {
readonly jsonrpc: "2.0"
readonly id: string | number | null
readonly result: Schema.Schema.Type<typeof Schema.Json>
readonly error?: never
}
| {
readonly jsonrpc: "2.0"
readonly id: string | number | null
readonly error: Schema.Schema.Type<typeof ErrorObject>
readonly result?: never
}
export const Response = decoded<Schema.Decoder<Response>>(
Schema.Struct({
jsonrpc: Schema.Literal("2.0"),
id: JsonRpcID,
result: Schema.optionalKey(Schema.Json),
error: Schema.optionalKey(ErrorObject),
}).check(
Schema.makeFilter((response) =>
"result" in response === "error" in response
? "JSON-RPC responses must contain exactly one of result or error"
: undefined,
),
),
)
export const Response = Schema.Struct({
jsonrpc: Schema.Literal("2.0"),
id: JsonRpcID,
result: Schema.optional(Schema.Json),
error: Schema.optional(ErrorObject),
})
export interface Response extends Schema.Schema.Type<typeof Response> {}
export const decodeRequest = Schema.decodeUnknownSync(Request)
@@ -73,161 +49,6 @@ export namespace JsonRpc {
}
}
export class SimulationRequestError extends Schema.TaggedErrorClass<SimulationRequestError>()(
"SimulationRequestError",
{
method: Schema.String,
code: Schema.Number,
message: Schema.String,
data: Schema.optionalKey(Schema.Json),
},
) {}
const request = <
const Tag extends string,
Payload extends Schema.Top | Schema.Struct.Fields = typeof Schema.Void,
Success extends Schema.Top = typeof Schema.Void,
>(
tag: Tag,
options?: {
readonly payload?: Payload
readonly success?: Success
},
) => Rpc.make(tag, { ...options, error: SimulationRequestError })
function operation<const Tag extends string, Success extends Schema.Decoder<unknown>>(method: Tag, success: Success) {
return {
method,
success,
request: Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal(method) }),
rpc: request(method, { success }),
}
}
function operationWithPayload<
const Tag extends string,
Payload extends Schema.Decoder<unknown>,
Success extends Schema.Decoder<unknown>,
>(method: Tag, payload: Payload, success: Success) {
return {
method,
payload,
success,
request: Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal(method), params: payload }),
rpc: request(method, { payload, success }),
}
}
function operationWithRpcPayload<
const Tag extends string,
Payload extends Schema.Decoder<unknown>,
RpcPayload extends Schema.Decoder<unknown>,
Success extends Schema.Decoder<unknown>,
>(method: Tag, payload: Payload, rpcPayload: RpcPayload, success: Success) {
return {
method,
payload,
success,
request: Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal(method), params: payload }),
rpc: request(method, { payload: rpcPayload, success }),
}
}
function notification<const Method extends string, Payload extends Schema.Decoder<unknown>>(
method: Method,
payload: Payload,
) {
return {
method,
payload,
schema: Schema.Struct({
jsonrpc: Schema.Literal("2.0"),
method: Schema.Literal(method),
params: payload,
}),
}
}
type OperationRequest<Operation> = Operation extends {
readonly method: infer Method extends string
readonly payload: infer Payload extends Schema.Top
}
? Omit<JsonRpc.Request, "method" | "params"> & {
readonly method: Method
readonly params: Schema.Schema.Type<Payload>
}
: Operation extends { readonly method: infer Method extends string }
? Omit<JsonRpc.Request, "method" | "params"> & { readonly method: Method }
: never
type EndpointRequest<Operations extends ReadonlyArray<{ readonly method: string }>> =
| Handshake.Request
| OperationRequest<Operations[number]>
type EndpointNotification<Notifications extends ReadonlyArray<{ readonly schema: Schema.Top }>> = Schema.Schema.Type<
Notifications[number]["schema"]
>
function endpoint<
const Operations extends ReadonlyArray<{
readonly method: string
readonly success: Schema.Top
readonly rpc: Rpc.Any
readonly request: Schema.Decoder<unknown>
readonly payload?: Schema.Decoder<unknown>
}>,
const Notifications extends ReadonlyArray<{
readonly method: string
readonly payload: Schema.Decoder<unknown>
readonly schema: Schema.Decoder<unknown>
}>,
const Capabilities extends ReadonlyArray<Handshake.Capability>,
>(
operations: Operations,
notifications: Notifications,
features: ReadonlyArray<Handshake.Capability>,
Capabilities: Capabilities,
) {
const requests: ReadonlyArray<Schema.Decoder<unknown>> = [
Handshake.Request,
...operations.map((operation) => operation.request),
]
const Request = Schema.Union(requests)
const Notification =
notifications.length === 0 ? Schema.Never : Schema.Union(notifications.map((notification) => notification.schema))
const decodeRequest = Schema.decodeUnknownSync(Request)
const decodeRequestEffect = Schema.decodeUnknownEffect(Schema.fromJsonString(Request))
const decodeNotification = Schema.decodeUnknownSync(Notification)
const decodeNotificationEffect = Schema.decodeUnknownEffect(Schema.fromJsonString(Notification))
const handshake = request("simulation.handshake", { payload: Handshake.Params, success: Handshake.Response })
const rpcs = RpcGroup.make(handshake, ...operations.map((operation) => operation.rpc)) as RpcGroup.RpcGroup<
typeof handshake | Operations[number]["rpc"]
>
const derived = [
...operations.map((operation) => operation.method),
...notifications.map((notification) => notification.method),
...features,
]
if (
new Set(Capabilities).size !== Capabilities.length ||
derived.length !== Capabilities.length ||
derived.some((capability) => !Capabilities.includes(capability))
)
throw new Error("Simulation capabilities must exactly match endpoint operations")
return {
Capabilities,
Request: decoded<Schema.Decoder<EndpointRequest<Operations>>>(Request),
Notification: decoded<Schema.Decoder<EndpointNotification<Notifications>>>(Notification),
decodeRequest: (input: unknown) => decoded<EndpointRequest<Operations>>(decodeRequest(input)),
decodeRequestEffect: (input: string) =>
decodeRequestEffect(input).pipe(Effect.map(decoded<EndpointRequest<Operations>>)),
decodeNotification: (input: unknown) => decoded<EndpointNotification<Notifications>>(decodeNotification(input)),
decodeNotificationEffect: (input: string) =>
decodeNotificationEffect(input).pipe(Effect.map(decoded<EndpointNotification<Notifications>>)),
rpcs,
}
}
export namespace Handshake {
export const ProtocolVersion = Schema.Literal(1)
export type ProtocolVersion = Schema.Schema.Type<typeof ProtocolVersion>
@@ -260,7 +81,7 @@ export namespace Handshake {
protocolVersion: ProtocolVersion,
role: EndpointRole,
server: Identity,
capabilities: Schema.Array(Capability).check(Schema.isUnique()),
capabilities: Schema.Array(Capability),
})
export interface Response extends Schema.Schema.Type<typeof Response> {}
@@ -344,6 +165,23 @@ export namespace Handshake {
}
export namespace Frontend {
export const Capabilities = [
"ui.type",
"ui.press",
"ui.enter",
"ui.arrow",
"ui.focus",
"ui.click",
"ui.click.semantic",
"ui.resize",
"ui.matches",
"ui.state",
"ui.snapshot",
"ui.capture",
"ui.recording.finish",
] as const satisfies ReadonlyArray<Handshake.Capability>
export type Capability = (typeof Capabilities)[number]
export const KeyModifiers = Schema.Struct({
ctrl: Schema.optional(Schema.Boolean),
shift: Schema.optional(Schema.Boolean),
@@ -499,51 +337,44 @@ export namespace Frontend {
export const ResizeParams = Schema.Struct({ cols: Schema.Number, rows: Schema.Number })
export interface ResizeParams extends Schema.Schema.Type<typeof ResizeParams> {}
}
const FrontendOperations = [
operation("ui.state", Frontend.State),
operation("ui.snapshot", Frontend.SemanticSnapshot),
operation("ui.capture", Frontend.CapturedFrame),
operationWithPayload("ui.matches", Frontend.MatchesParams, Frontend.Matches),
operation("ui.recording.finish", Frontend.RecordingFinish),
operationWithPayload("ui.type", Frontend.TypeParams, Frontend.State),
operationWithPayload("ui.press", Frontend.PressParams, Frontend.State),
operation("ui.enter", Frontend.State),
operationWithPayload("ui.arrow", Frontend.ArrowParams, Frontend.State),
operationWithPayload("ui.focus", Frontend.FocusParams, Frontend.State),
operationWithPayload("ui.click", Frontend.ClickParams, Frontend.State),
operationWithPayload("ui.resize", Frontend.ResizeParams, Frontend.State),
] as const
const FrontendCapabilities = [
"ui.type",
"ui.press",
"ui.enter",
"ui.arrow",
"ui.focus",
"ui.click",
"ui.click.semantic",
"ui.resize",
"ui.matches",
"ui.state",
"ui.snapshot",
"ui.capture",
"ui.recording.finish",
] as const
const FrontendEndpoint = endpoint(FrontendOperations, [], ["ui.click.semantic"], FrontendCapabilities)
type FrontendRequest = EndpointRequest<typeof FrontendOperations>
export namespace Frontend {
export const Capabilities: typeof FrontendCapabilities = FrontendEndpoint.Capabilities
export type Capability = (typeof Capabilities)[number]
export const Request: Schema.Decoder<FrontendRequest> = FrontendEndpoint.Request
export type Request = FrontendRequest
export const decodeRequest: (input: unknown) => Request = FrontendEndpoint.decodeRequest
export const decodeRequestEffect: (input: string) => Effect.Effect<Request, Schema.SchemaError> =
FrontendEndpoint.decodeRequestEffect
export const Request = Schema.Union([
Handshake.Request,
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.type"), params: TypeParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.press"), params: PressParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.arrow"), params: ArrowParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.focus"), params: FocusParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.click"), params: ClickParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.resize"), params: ResizeParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.matches"), params: MatchesParams }),
Schema.Struct({
...JsonRpc.RequestFields,
method: Schema.Literals(["ui.enter", "ui.state", "ui.snapshot", "ui.recording.finish"]),
}),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("ui.capture") }),
])
export type Request = Schema.Schema.Type<typeof Request>
export const decodeRequest = Schema.decodeUnknownSync(Request)
export const decodeRequestEffect = Schema.decodeUnknownEffect(Schema.fromJsonString(Request))
}
export namespace Backend {
export const Capabilities = [
"llm.attach",
"llm.chunk",
"llm.finish",
"llm.disconnect",
"llm.pending",
"llm.request",
"llm.tool-input-delta",
"tool.attach",
"tool.update",
"tool.finish",
"tool.fail",
"tool.invocation",
"tool.cancel",
] as const satisfies ReadonlyArray<Handshake.Capability>
export const Item = Schema.Union([
Schema.Struct({ type: Schema.Literal("textDelta"), text: Schema.String }),
Schema.Struct({ type: Schema.Literal("reasoningDelta"), text: Schema.String }),
@@ -702,6 +533,24 @@ export namespace Backend {
export const DisconnectParams = Schema.Struct({ id: Schema.String })
export interface DisconnectParams extends Schema.Schema.Type<typeof DisconnectParams> {}
export const Request = Schema.Union([
Handshake.Request,
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("llm.chunk"), params: ChunkParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("llm.finish"), params: FinishParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("llm.disconnect"), params: DisconnectParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("tool.attach"), params: ToolAttachParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("tool.update"), params: ToolUpdateParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("tool.finish"), params: ToolFinishParams }),
Schema.Struct({ ...JsonRpc.RequestFields, method: Schema.Literal("tool.fail"), params: ToolFailParams }),
Schema.Struct({
...JsonRpc.RequestFields,
method: Schema.Literals(["llm.attach", "llm.pending"]),
}),
])
export type Request = Schema.Schema.Type<typeof Request>
export const decodeRequest = Schema.decodeUnknownSync(Request)
export const decodeRequestEffect = Schema.decodeUnknownEffect(Schema.fromJsonString(Request))
export const ProviderInvocation = Schema.Struct({ id: Schema.String, url: Schema.String, body: Schema.Json })
export interface ProviderInvocation extends Schema.Schema.Type<typeof ProviderInvocation> {}
@@ -717,54 +566,53 @@ export namespace Backend {
export interface NetworkLogEntry extends Schema.Schema.Type<typeof NetworkLogEntry> {}
}
const BackendOperations = [
operation("llm.attach", Backend.Attached),
operation("llm.pending", Backend.Pending),
operationWithPayload("llm.chunk", Backend.ChunkParams, Backend.Ok),
operationWithRpcPayload("llm.finish", Backend.FinishParams, Backend.FinishPayload, Backend.Ok),
operationWithPayload("llm.disconnect", Backend.DisconnectParams, Backend.Ok),
operationWithPayload("tool.attach", Backend.ToolAttachParams, Backend.Attached),
operationWithPayload("tool.update", Backend.ToolUpdateParams, Backend.Ok),
operationWithPayload("tool.finish", Backend.ToolFinishParams, Backend.Ok),
operationWithPayload("tool.fail", Backend.ToolFailParams, Backend.Ok),
] as const
const BackendNotifications = [
notification("llm.request", Backend.ProviderInvocation),
notification("tool.invocation", Backend.ToolInvocation),
notification("tool.cancel", Backend.ToolCancellation),
] as const
const BackendCapabilities = [
"llm.attach",
"llm.chunk",
"llm.finish",
"llm.disconnect",
"llm.pending",
"llm.request",
"llm.tool-input-delta",
"tool.attach",
"tool.update",
"tool.finish",
"tool.fail",
"tool.invocation",
"tool.cancel",
] as const
const BackendEndpoint = endpoint(BackendOperations, BackendNotifications, ["llm.tool-input-delta"], BackendCapabilities)
type BackendRequest = EndpointRequest<typeof BackendOperations>
type BackendNotification = EndpointNotification<typeof BackendNotifications>
export class SimulationRequestError extends Schema.TaggedErrorClass<SimulationRequestError>()(
"SimulationRequestError",
{
method: Schema.String,
code: Schema.Number,
message: Schema.String,
data: Schema.optionalKey(Schema.Json),
},
) {}
export namespace Backend {
export const Capabilities: typeof BackendCapabilities = BackendEndpoint.Capabilities
export const Request: Schema.Decoder<BackendRequest> = BackendEndpoint.Request
export type Request = BackendRequest
export const decodeRequest: (input: unknown) => Request = BackendEndpoint.decodeRequest
export const decodeRequestEffect: (input: string) => Effect.Effect<Request, Schema.SchemaError> =
BackendEndpoint.decodeRequestEffect
export const Notification: Schema.Decoder<BackendNotification> = BackendEndpoint.Notification
export type Notification = BackendNotification
export const decodeNotification: (input: unknown) => Notification = BackendEndpoint.decodeNotification
export const decodeNotificationEffect: (input: string) => Effect.Effect<Notification, Schema.SchemaError> =
BackendEndpoint.decodeNotificationEffect
}
const request = <
const Tag extends string,
Payload extends Schema.Top | Schema.Struct.Fields = typeof Schema.Void,
Success extends Schema.Top = typeof Schema.Void,
>(
tag: Tag,
options?: {
readonly payload?: Payload
readonly success?: Success
},
) => Rpc.make(tag, { ...options, error: SimulationRequestError })
export const UiRpcs = FrontendEndpoint.rpcs
export const BackendRpcs = BackendEndpoint.rpcs
export const UiRpcs = RpcGroup.make(
request("simulation.handshake", { payload: Handshake.Params, success: Handshake.Response }),
request("ui.state", { success: Frontend.State }),
request("ui.snapshot", { success: Frontend.SemanticSnapshot }),
request("ui.capture", { success: Frontend.CapturedFrame }),
request("ui.matches", { payload: Frontend.MatchesParams, success: Frontend.Matches }),
request("ui.recording.finish", { success: Frontend.RecordingFinish }),
request("ui.type", { payload: Frontend.TypeParams, success: Frontend.State }),
request("ui.press", { payload: Frontend.PressParams, success: Frontend.State }),
request("ui.enter", { success: Frontend.State }),
request("ui.arrow", { payload: Frontend.ArrowParams, success: Frontend.State }),
request("ui.focus", { payload: Frontend.FocusParams, success: Frontend.State }),
request("ui.click", { payload: Frontend.ClickParams, success: Frontend.State }),
request("ui.resize", { payload: Frontend.ResizeParams, success: Frontend.State }),
)
export const BackendRpcs = RpcGroup.make(
request("simulation.handshake", { payload: Handshake.Params, success: Handshake.Response }),
request("llm.attach", { success: Backend.Attached }),
request("llm.pending", { success: Backend.Pending }),
request("llm.chunk", { payload: Backend.ChunkParams, success: Backend.Ok }),
request("llm.finish", { payload: Backend.FinishPayload, success: Backend.Ok }),
request("llm.disconnect", { payload: Backend.DisconnectParams, success: Backend.Ok }),
request("tool.attach", { payload: Backend.ToolAttachParams, success: Backend.Attached }),
request("tool.update", { payload: Backend.ToolUpdateParams, success: Backend.Ok }),
request("tool.finish", { payload: Backend.ToolFinishParams, success: Backend.Ok }),
request("tool.fail", { payload: Backend.ToolFailParams, success: Backend.Ok }),
)
+1 -105
View File
@@ -1,110 +1,6 @@
import { describe, expect, test } from "bun:test"
import { Effect, Schema } from "effect"
import { Backend, BackendRpcs, Frontend, Handshake, JsonRpc, UiRpcs } from "../src/protocol"
const uiCapability: Frontend.Capability = "ui.state"
// @ts-expect-error capability literals must remain narrow for consumers
const invalidUiCapability: Frontend.Capability = "ui.future"
const successResponse: Schema.Schema.Type<typeof JsonRpc.Response> = { jsonrpc: "2.0", id: 1, result: null }
// @ts-expect-error responses require one outcome
const missingResponse: Schema.Schema.Type<typeof JsonRpc.Response> = { jsonrpc: "2.0", id: 1 }
// @ts-expect-error responses cannot contain both outcomes
const invalidResponse: Schema.Schema.Type<typeof JsonRpc.Response> = {
jsonrpc: "2.0",
id: 1,
result: null,
error: { code: -32600, message: "Invalid request" },
}
void [uiCapability, invalidUiCapability, successResponse, missingResponse, invalidResponse]
test("preserves capability order and keeps request capabilities aligned with RPC groups", () => {
expect(Frontend.Capabilities).toEqual([
"ui.type",
"ui.press",
"ui.enter",
"ui.arrow",
"ui.focus",
"ui.click",
"ui.click.semantic",
"ui.resize",
"ui.matches",
"ui.state",
"ui.snapshot",
"ui.capture",
"ui.recording.finish",
])
expect(Backend.Capabilities).toEqual([
"llm.attach",
"llm.chunk",
"llm.finish",
"llm.disconnect",
"llm.pending",
"llm.request",
"llm.tool-input-delta",
"tool.attach",
"tool.update",
"tool.finish",
"tool.fail",
"tool.invocation",
"tool.cancel",
])
expect(new Set<string>(Frontend.Capabilities.filter((capability) => capability !== "ui.click.semantic"))).toEqual(
new Set(Array.from(UiRpcs.requests.keys()).filter((method) => method !== "simulation.handshake")),
)
expect(
new Set<string>(
Backend.Capabilities.filter(
(capability) => !["llm.request", "llm.tool-input-delta", "tool.invocation", "tool.cancel"].includes(capability),
),
),
).toEqual(new Set(Array.from(BackendRpcs.requests.keys()).filter((method) => method !== "simulation.handshake")))
})
test("normalizes an omitted finish reason", () => {
expect(Backend.decodeRequest({ jsonrpc: "2.0", id: 1, method: "llm.finish", params: { id: "inv_1" } })).toMatchObject(
{ params: { id: "inv_1", reason: "stop" } },
)
})
test("decodes typed backend notifications", () => {
expect(
Backend.decodeNotification({
jsonrpc: "2.0",
method: "tool.cancel",
params: { id: "tool_1", reason: "interrupted" },
}),
).toEqual({
jsonrpc: "2.0",
method: "tool.cancel",
params: { id: "tool_1", reason: "interrupted" },
})
expect(() =>
Backend.decodeNotification({
jsonrpc: "2.0",
method: "tool.cancel",
params: { id: "tool_1", reason: "unknown" },
}),
).toThrow()
})
test("requires exactly one JSON-RPC response outcome", () => {
const decode = Schema.decodeUnknownSync(JsonRpc.Response)
expect(decode({ jsonrpc: "2.0", id: 1, result: null })).toEqual({ jsonrpc: "2.0", id: 1, result: null })
expect(decode({ jsonrpc: "2.0", id: 1, error: { code: -32600, message: "Invalid request" } })).toEqual({
jsonrpc: "2.0",
id: 1,
error: { code: -32600, message: "Invalid request" },
})
expect(() => decode({ jsonrpc: "2.0", id: 1 })).toThrow()
expect(() =>
decode({
jsonrpc: "2.0",
id: 1,
result: null,
error: { code: -32600, message: "Invalid request" },
}),
).toThrow()
})
import { Backend, Frontend, Handshake } from "../src/protocol"
test("decodes ui.matches text params", () => {
expect(
@@ -83,7 +83,7 @@ test("streams a Drive-controlled provider response and removes the finished invo
jsonrpc: "2.0",
id: 3,
method: "llm.finish",
params: { id: params.id },
params: { id: params.id, reason: "stop" },
}),
)
expect(yield* Queue.take(messages)).toMatchObject({ id: 3, result: { ok: true } })
+22 -7
View File
@@ -70,6 +70,7 @@ import {
import { DialogImagePreview } from "../dialog-image-preview"
import { useDirectoryRecents } from "../../prompt/directory-recents"
import { directoryRecentValue } from "../../prompt/directory-completion"
import { useWorkingDirectoryActions } from "../../ui/working-directory-actions"
export type PromptProps = {
sessionID?: string
@@ -1539,21 +1540,25 @@ export function Prompt(props: PromptProps) {
const width = dimensions().width < 44 ? dimensions().width - 5 : Math.min(75, dimensions().width - 4) - 5
return Locale.takeWidth(value, Math.max(1, width)).trimEnd()
})
const locationLabel = createMemo(() => {
const footerLocation = createMemo(() => {
if (!props.sessionID) {
// No session yet: show where the next session will be created.
const location = currentLocation.ref ?? data.location.default()
const directory = abbreviateHome(location.directory, paths.home)
const branch = data.location.vcs.info(location)?.branch.current
return branch ? `${directory}:${branch}` : directory
return currentLocation.ref ?? data.location.default()
}
if (status() !== "idle") return
const location = data.session.get(props.sessionID)?.location
return data.session.get(props.sessionID)?.location
})
const locationLabel = createMemo(() => {
const location = footerLocation()
if (!location) return
const directory = abbreviateHome(location.directory, paths.home)
const branch = data.location.vcs.info(location)?.branch.current
return branch ? `${directory}:${branch}` : directory
})
const locationActions = useWorkingDirectoryActions({
directory: () => footerLocation()?.directory,
onMove: () => void move.open(),
})
const spinnerDef = createMemo(() => {
const agent = status() === "running" ? local.agent.current() : local.agent.current()
@@ -1874,7 +1879,17 @@ export function Prompt(props: PromptProps) {
<Match when={true}>
<Show when={!props.hint && locationLabel()} fallback={props.hint ?? <text />}>
{(location) => (
<text fg={theme.text.subdued} wrapMode="none" truncate flexGrow={1} flexShrink={1}>
<text
id="prompt.footer.location"
fg={locationActions.hovered() ? theme.text.default : theme.text.subdued}
wrapMode="none"
truncate
flexGrow={1}
flexShrink={1}
onMouseOver={locationActions.onMouseOver}
onMouseOut={locationActions.onMouseOut}
onMouseUp={locationActions.onMouseUp}
>
{location()}
</text>
)}
@@ -1,8 +1,18 @@
import { Plugin } from "@opencode-ai/plugin/tui"
import { createMemo, Show } from "solid-js"
import { FilePath } from "../../ui/file-path"
import { useWorkingDirectoryActions } from "../../ui/working-directory-actions"
import { usePromptMove } from "../../component/prompt/move"
function View(props: { context: Plugin.Context }) {
function View(props: { context: Plugin.Context; sessionID: string }) {
const move = usePromptMove({
projectID: () => props.context.data.session.get(props.sessionID)?.projectID,
sessionID: () => props.sessionID,
})
const actions = useWorkingDirectoryActions({
directory: () => props.context.location?.directory,
onMove: () => void move.open(),
})
const directory = createMemo(() => {
if (!props.context.location) return undefined
const value = props.context.ui.format.path(props.context.location.directory)
@@ -11,7 +21,20 @@ function View(props: { context: Plugin.Context }) {
})
return (
<Show when={directory()}>
{(value) => <FilePath value={value()} maxWidth={38} fg={props.context.theme.text.subdued} />}
{(value) => (
<box
id="sidebar.footer.location"
onMouseOver={actions.onMouseOver}
onMouseOut={actions.onMouseOut}
onMouseUp={actions.onMouseUp}
>
<FilePath
value={value()}
maxWidth={38}
fg={actions.hovered() ? props.context.theme.text.default : props.context.theme.text.subdued}
/>
</box>
)}
</Show>
)
}
@@ -21,6 +44,9 @@ export default Plugin.define({
setup(context) {
// Append keeps the path open to additive plugin claims; an external
// replace still takes the boundary over.
context.ui.slot({ append: "sidebar.footer", render: () => <View context={context} /> })
context.ui.slot({
append: "sidebar.footer",
render: (props) => <View context={context} sessionID={props.sessionID} />,
})
},
})
+1 -1
View File
@@ -57,7 +57,7 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
</scrollbox>
<box flexShrink={0} gap={1} paddingTop={1}>
<Slot path="sidebar.footer" />
<Slot path="sidebar.footer" input={{ sessionID: props.sessionID }} />
</box>
</box>
</Show>
@@ -0,0 +1,66 @@
import { createSignal } from "solid-js"
import open from "open"
import { useRenderer } from "@opentui/solid"
import { useClipboard } from "../context/clipboard"
import { useDialog } from "./dialog"
import { DialogSelect } from "./dialog-select"
import { useToast } from "./toast"
export function useWorkingDirectoryActions(input: { directory: () => string | undefined; onMove?: () => void }) {
const clipboard = useClipboard()
const dialog = useDialog()
const renderer = useRenderer()
const toast = useToast()
const [hovered, setHovered] = createSignal(false)
function openMenu() {
if (renderer.getSelection()?.getSelectedText()) return
const directory = input.directory()
if (!directory) return
dialog.replace(() => (
<DialogSelect
title="Working directory"
renderFilter={false}
options={[
{
title: "Copy path",
value: "location.copy",
description: directory,
onSelect: (dialog) => {
void clipboard.write(directory).then(() => {
dialog.clear()
toast.show({ message: "Path copied to clipboard", variant: "info" })
}, toast.error)
},
},
{
title: "Open folder",
value: "location.open",
description: "in system file manager",
onSelect: (dialog) => {
dialog.clear()
void open(directory).catch(toast.error)
},
},
...(input.onMove
? [
{
title: "Move session",
value: "session.move",
description: "to another working directory",
onSelect: () => void input.onMove?.(),
},
]
: []),
]}
/>
))
}
return {
hovered,
onMouseOver: () => setHovered(true),
onMouseOut: () => setHovered(false),
onMouseUp: openMenu,
}
}