mirror of
https://github.com/stablyai/orca.git
synced 2026-10-27 00:02:48 +00:00
* fix(orchestration): complete worker tasks and improve coordinator UX
* Fix orchestration lifecycle sender resolution and peek/check compat hand
- Lifecycle sends (worker_done/heartbeat) now use ORCA_TERMINAL_HANDLE
verbatim, skipping the liveness probe and pane remint that could
block delivery during restarts or mismatch stale-runtime assignee
handles.
- --peek now round-trips as {peek:true, unread:false} so older runtimes
that strip unknown params degrade to non-destructive "all" instead of
mark-read, with client-side filtering to restore peek semantics and a
clear error when --peek --wait can't be honored.
- Reject combined read-mode flags (--unread/--peek/--all) before calling
the runtime.
- Distinguish suppressed (already-consumed) lifecycle messages from
ignored ones so send doesn't wake --wait waiters for stale heartbeats.
- Fix task summary truncation to avoid splitting UTF-16 surrogate pairs
and to not misreport whitespace normalization as truncation.
* Add shared helper to abbreviate orchestration task specs for brief listi
- Normalizes whitespace and caps spec length at 160 chars, flagging
truncation separately from whitespace-only changes
- Truncates on UTF-16 code point boundaries to avoid splitting
surrogate pairs and emitting malformed strings
* Add pane-key identity to worker_done/heartbeat reconciliation and server
- Records the sender's pane key on messages and dispatch contexts so
worker_done/heartbeat ownership can be verified by the remint-stable
pane leaf instead of the terminal handle, which is reissued across
restarts.
- Rejects lifecycle messages from a genuinely foreign pane while still
tolerating handle remints, tab break-outs, and older CLIs that lack
pane identity.
- Moves task-spec abbreviation server-side (orchestration.taskList
--brief) so full specs no longer cross SSH/relay transports, with a
client-side fallback for older runtimes; consolidates the shared
abbreviation helper under src/shared.
- Adds a stderr warning when a pre-peek runtime's --peek response hits
the 100-row cap, since older unread messages may be missing.
* Isolate ORCA_PANE_KEY in CLI test beforeEach to fix leaked senderPaneKey
Co-authored-by: Orca <help@stably.ai>
* Fix pane-key remint bypassing dispatch mutual-exclusion lock
- Dispatch locking only matched on assignee_handle, so a reminted
terminal handle (tab break-out) could open a second concurrent
dispatch on the same pane.
- Add leaf-UUID-based pane key comparison (parsePaneKey) as a
secondary lock, falling back to exact handle match for legacy
rows without pane keys.
* Update orchestration skill docs for lifecycle authority and CLI flag add
- Clarify that dispatch lifecycle is tied to taskId+dispatchId verified against
the dispatched pane, not the terminal handle, since handles can be reminted
after restart
- Document new `check --peek`/`--all` and `task-list --brief` flags, with
fallback guidance for older CLIs that reject them
- Note that a valid worker_done auto-completes the task/dispatch, so workers
shouldn't also call task-update manually
---------
Co-authored-by: Orca <help@stably.ai>
249 lines
9.3 KiB
TypeScript
249 lines
9.3 KiB
TypeScript
import {
|
|
finishAutomationWorkspaceProvenanceRequest,
|
|
releaseAutomationWorkspaceProvenanceRequest,
|
|
resolveAutomationWorkspaceProvenance
|
|
} from '../../../automations/workspace-provenance'
|
|
import { defineMethod, type RpcMethod } from '../core'
|
|
import {
|
|
WorktreeCreate,
|
|
WorktreeDetectedListParams,
|
|
WorktreeActivate,
|
|
WorktreeForceDeleteBranch,
|
|
WorktreeListParams,
|
|
WorktreePrefetchCreateBase,
|
|
WorktreePsParams,
|
|
WorktreeRemove,
|
|
WorktreeResolveMrBase,
|
|
WorktreeResolvePrBase,
|
|
WorktreeSelector,
|
|
WorktreeSet,
|
|
WorktreeSortOrder
|
|
} from './worktree-schemas'
|
|
|
|
export const WORKTREE_METHODS: RpcMethod[] = [
|
|
defineMethod({
|
|
name: 'worktree.ps',
|
|
params: WorktreePsParams,
|
|
handler: async (params, { runtime }) => runtime.getWorktreePs(params.limit)
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.list',
|
|
params: WorktreeListParams,
|
|
handler: async (params, { runtime }) => runtime.listManagedWorktrees(params.repo, params.limit)
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.detectedList',
|
|
params: WorktreeDetectedListParams,
|
|
handler: async (params, { runtime }) => runtime.listDetectedManagedWorktrees(params.repo)
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.lineageList',
|
|
params: null,
|
|
handler: async (_params, { runtime }) => ({
|
|
lineage: await runtime.listWorktreeLineage(),
|
|
workspaceLineage: await runtime.listWorkspaceLineage()
|
|
})
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.show',
|
|
params: WorktreeSelector,
|
|
handler: async (params, { runtime }) => ({
|
|
worktree: await runtime.showManagedWorktree(params.worktree)
|
|
})
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.sleep',
|
|
params: WorktreeSelector,
|
|
handler: async (params, { runtime }) => runtime.sleepManagedWorktree(params.worktree)
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.activate',
|
|
params: WorktreeActivate,
|
|
handler: async (params, { runtime, clientKind }) =>
|
|
// Why: clientKind ('mobile'|'runtime') scopes the host-renderer slept-agent
|
|
// wake to phones so web/desktop activation behavior is unchanged.
|
|
runtime.activateManagedWorktree(params.worktree, {
|
|
notifyClients: params.notifyClients !== false,
|
|
clientKind
|
|
})
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.create',
|
|
params: WorktreeCreate,
|
|
handler: async (params, { runtime }) => {
|
|
const repo = await runtime.showRepo(params.repo)
|
|
const automationProvenance = resolveAutomationWorkspaceProvenance({
|
|
authority: runtime,
|
|
repoSelector: params.repo,
|
|
repo,
|
|
request: params.automationProvenanceRequest
|
|
})
|
|
// Why: provenance tokens are reserved before creation so retries can recover,
|
|
// but failed create attempts must release the reservation for a safe retry.
|
|
try {
|
|
const result = await runtime.createManagedWorktree({
|
|
repoSelector: params.repo,
|
|
name: params.name ?? '',
|
|
baseBranch: params.baseBranch,
|
|
compareBaseRef: params.compareBaseRef,
|
|
branchNameOverride: params.branchNameOverride,
|
|
linkedIssue: params.linkedIssue,
|
|
linkedPR: params.linkedPR,
|
|
linkedLinearIssue: params.linkedLinearIssue,
|
|
linkedLinearIssueWorkspaceId: params.linkedLinearIssueWorkspaceId,
|
|
linkedLinearIssueOrganizationUrlKey: params.linkedLinearIssueOrganizationUrlKey,
|
|
linkedGitLabMR: params.linkedGitLabMR,
|
|
linkedGitLabIssue: params.linkedGitLabIssue,
|
|
linkedBitbucketPR: params.linkedBitbucketPR,
|
|
linkedAzureDevOpsPR: params.linkedAzureDevOpsPR,
|
|
linkedGiteaPR: params.linkedGiteaPR,
|
|
comment: params.comment,
|
|
displayName: params.displayName,
|
|
telemetrySource: params.telemetrySource,
|
|
workspaceStatus: params.workspaceStatus,
|
|
manualOrder: params.manualOrder,
|
|
sparseCheckout: params.sparseCheckout,
|
|
pushTarget: params.pushTarget,
|
|
runHooks: params.runHooks === true,
|
|
activate: params.activate === true,
|
|
setupDecision: params.setupDecision,
|
|
createdWithAgent: params.createdWithAgent ?? params.startupAgent,
|
|
automationProvenance,
|
|
startup: params.startupCommand
|
|
? {
|
|
command: params.startupCommand,
|
|
...(params.startupEnv ? { env: params.startupEnv } : {}),
|
|
...(params.startupLaunchConfig ? { launchConfig: params.startupLaunchConfig } : {}),
|
|
...(params.startupCommandDelivery
|
|
? { startupCommandDelivery: params.startupCommandDelivery }
|
|
: {})
|
|
}
|
|
: undefined,
|
|
...(params.startupAgent ? { startupAgent: params.startupAgent } : {}),
|
|
...(params.startupPrompt !== undefined ? { startupPrompt: params.startupPrompt } : {}),
|
|
startupDraft: params.startupDraft,
|
|
lineage: {
|
|
parentWorkspace: params.parentWorkspace,
|
|
envParentWorkspace: params.envParentWorkspace,
|
|
parentWorktree: params.parentWorktree,
|
|
...(params.cwdParentWorktree ? { cwdParentWorktree: params.cwdParentWorktree } : {}),
|
|
noParent: params.noParent === true,
|
|
callerTerminalHandle: params.callerTerminalHandle,
|
|
orchestrationContext: params.orchestrationContext
|
|
}
|
|
})
|
|
finishAutomationWorkspaceProvenanceRequest(params.automationProvenanceRequest)
|
|
// Why: agent callers need a stable dispatch target without traversing
|
|
// terminal-list layout duplicates after creating the worktree.
|
|
return params.startupAgent && result.startupTerminal?.handle
|
|
? { ...result, agentTerminalHandle: result.startupTerminal.handle }
|
|
: result
|
|
} catch (error) {
|
|
releaseAutomationWorkspaceProvenanceRequest(params.automationProvenanceRequest)
|
|
throw error
|
|
}
|
|
}
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.prefetchCreateBase',
|
|
params: WorktreePrefetchCreateBase,
|
|
handler: async (params, { runtime }) => {
|
|
await runtime.prefetchManagedWorktreeCreateBase({
|
|
repoSelector: params.repo,
|
|
baseBranch: params.baseBranch
|
|
})
|
|
return null
|
|
}
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.set',
|
|
params: WorktreeSet,
|
|
handler: async (params, { runtime }) => ({
|
|
worktree: await runtime.updateManagedWorktreeMeta(params.worktree, {
|
|
displayName: params.displayName,
|
|
linkedIssue: params.linkedIssue,
|
|
linkedPR: params.linkedPR,
|
|
linkedLinearIssue: params.linkedLinearIssue,
|
|
linkedLinearIssueWorkspaceId: params.linkedLinearIssueWorkspaceId,
|
|
linkedLinearIssueOrganizationUrlKey: params.linkedLinearIssueOrganizationUrlKey,
|
|
linkedGitLabMR: params.linkedGitLabMR,
|
|
linkedGitLabIssue: params.linkedGitLabIssue,
|
|
linkedBitbucketPR: params.linkedBitbucketPR,
|
|
linkedAzureDevOpsPR: params.linkedAzureDevOpsPR,
|
|
linkedGiteaPR: params.linkedGiteaPR,
|
|
comment: params.comment,
|
|
isArchived: params.isArchived,
|
|
isUnread: params.isUnread,
|
|
isPinned: params.isPinned,
|
|
sortOrder: params.sortOrder,
|
|
manualOrder: params.manualOrder,
|
|
lastActivityAt: params.lastActivityAt,
|
|
createdAt: params.createdAt,
|
|
sparseDirectories: params.sparseDirectories,
|
|
sparseBaseRef: params.sparseBaseRef,
|
|
sparsePresetId: params.sparsePresetId,
|
|
baseRef: params.baseRef,
|
|
workspaceStatus: params.workspaceStatus,
|
|
pushTarget: params.pushTarget,
|
|
diffComments: params.diffComments,
|
|
mobileDiffReview: params.mobileDiffReview,
|
|
lineage:
|
|
params.parentWorktree || params.noParent === true
|
|
? {
|
|
parentWorktree: params.parentWorktree,
|
|
noParent: params.noParent === true
|
|
}
|
|
: undefined
|
|
} as Parameters<typeof runtime.updateManagedWorktreeMeta>[1])
|
|
})
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.persistSortOrder',
|
|
params: WorktreeSortOrder,
|
|
handler: async (params, { runtime }) =>
|
|
runtime.persistManagedWorktreeSortOrder(params.orderedIds)
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.resolvePrBase',
|
|
params: WorktreeResolvePrBase,
|
|
handler: async (params, { runtime }) =>
|
|
runtime.resolveManagedPrBase({
|
|
repoSelector: params.repo,
|
|
prNumber: params.prNumber,
|
|
headRefName: params.headRefName,
|
|
baseRefName: params.baseRefName,
|
|
isCrossRepository: params.isCrossRepository
|
|
})
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.resolveMrBase',
|
|
params: WorktreeResolveMrBase,
|
|
handler: async (params, { runtime }) =>
|
|
runtime.resolveManagedMrBase({
|
|
repoSelector: params.repo,
|
|
mrIid: params.mrIid,
|
|
sourceBranch: params.sourceBranch,
|
|
targetBranch: params.targetBranch,
|
|
isCrossRepository: params.isCrossRepository
|
|
})
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.rm',
|
|
params: WorktreeRemove,
|
|
handler: async (params, { runtime }) => {
|
|
const result = await runtime.removeManagedWorktree(
|
|
params.worktree,
|
|
params.force === true,
|
|
params.runHooks === true
|
|
)
|
|
return { removed: true, ...result }
|
|
}
|
|
}),
|
|
defineMethod({
|
|
name: 'worktree.forceDeleteBranch',
|
|
params: WorktreeForceDeleteBranch,
|
|
handler: async (params, { runtime }) =>
|
|
runtime.forceDeletePreservedBranch(params.worktree, params.branchName, params.expectedHead)
|
|
})
|
|
]
|