@bakers-build/addon-orca 0.8.1-next.1 → 0.8.1-next.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/workspace.js +2 -3
- package/options.schema.json +37 -16
- package/package.json +6 -6
package/dist/src/workspace.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
|
-
import { resolveBaseRef, restoreWritable,
|
|
3
|
+
import { resolveBaseRef, restoreWritable, } from '@bakers-build/addon-herdr/shared';
|
|
4
4
|
import { loadInstructions, removeGitWorktree, runBranchGit, } from '@bakers-build/addon-workspace-git';
|
|
5
5
|
import { deriveCheckoutRoot, exec } from '@bakers-build/core';
|
|
6
6
|
import { assertOrcaReachable, createOrcaExec, isRecord, OrcaError, } from './orca-cli.js';
|
|
@@ -105,7 +105,6 @@ export class OrcaWorkspace {
|
|
|
105
105
|
if (branch === undefined) {
|
|
106
106
|
throw new Error('orca workspace requires a branch name');
|
|
107
107
|
}
|
|
108
|
-
validateBranch(branch);
|
|
109
108
|
const extra = this.options.autoSetupMerge
|
|
110
109
|
? {}
|
|
111
110
|
: { env: await runBranchGit(this.root, this.logger) };
|
|
@@ -153,7 +152,7 @@ export class OrcaWorkspace {
|
|
|
153
152
|
return;
|
|
154
153
|
}
|
|
155
154
|
try {
|
|
156
|
-
await this.execGit(['-C', this.root, 'fetch', 'origin', branch]);
|
|
155
|
+
await this.execGit(['-C', this.root, 'fetch', 'origin', '--', branch]);
|
|
157
156
|
}
|
|
158
157
|
catch {
|
|
159
158
|
// Non-fatal: the branch is simply not on origin (yet).
|
package/options.schema.json
CHANGED
|
@@ -6,49 +6,65 @@
|
|
|
6
6
|
"properties": {
|
|
7
7
|
"command": {
|
|
8
8
|
"type": "string",
|
|
9
|
-
"description": "Fallback agent command when the
|
|
9
|
+
"description": "Fallback agent command when the agent addons supply none.",
|
|
10
|
+
"default": "claude"
|
|
10
11
|
},
|
|
11
12
|
"open": {
|
|
12
13
|
"type": "object",
|
|
13
|
-
"description": "Overview terminal of a fresh worktree; `{}` opens
|
|
14
|
+
"description": "Overview terminal of a fresh worktree; when omitted it runs `bakers ui --ticket {identifier}` titled `{identifier} · {title}`, `{}` opens none. Templates expand {identifier}, {branch}, {title}, {worktree_path}.",
|
|
14
15
|
"properties": {
|
|
15
16
|
"command": {
|
|
16
|
-
"type": "string"
|
|
17
|
+
"type": "string",
|
|
18
|
+
"description": "Command of the overview terminal.",
|
|
19
|
+
"default": "bakers ui --ticket {identifier}"
|
|
17
20
|
},
|
|
18
21
|
"title": {
|
|
19
|
-
"type": "string"
|
|
22
|
+
"type": "string",
|
|
23
|
+
"description": "Title of the overview terminal.",
|
|
24
|
+
"default": "{identifier} · {title}"
|
|
20
25
|
}
|
|
21
26
|
},
|
|
22
27
|
"additionalProperties": false
|
|
23
28
|
},
|
|
24
29
|
"root": {
|
|
25
30
|
"type": "string",
|
|
26
|
-
"description": "Main clone;
|
|
31
|
+
"description": "Main clone path; derived from Git's common directory when omitted."
|
|
27
32
|
},
|
|
28
33
|
"default": {
|
|
29
|
-
"$ref": "#/$defs/state"
|
|
34
|
+
"$ref": "#/$defs/state",
|
|
35
|
+
"description": "Agent terminal settings for every run; a `states` entry beats it."
|
|
30
36
|
},
|
|
31
37
|
"states": {
|
|
32
38
|
"type": "object",
|
|
33
39
|
"additionalProperties": {
|
|
34
40
|
"$ref": "#/$defs/state"
|
|
41
|
+
},
|
|
42
|
+
"description": "Agent terminal settings per workflow state.",
|
|
43
|
+
"propertyNames": {
|
|
44
|
+
"title": "state"
|
|
35
45
|
}
|
|
36
46
|
},
|
|
37
47
|
"launch_watch": {
|
|
38
48
|
"type": "object",
|
|
39
|
-
"description": "Launch-watch windows:
|
|
49
|
+
"description": "Launch-watch windows: how long a start may take and how soon an agent exit counts as a failed launch.",
|
|
40
50
|
"properties": {
|
|
41
51
|
"timeout_ms": {
|
|
42
52
|
"type": "integer",
|
|
43
|
-
"minimum": 0
|
|
53
|
+
"minimum": 0,
|
|
54
|
+
"description": "Window after start in which an immediate agent exit fails the launch; 0 skips it.",
|
|
55
|
+
"default": 4000
|
|
44
56
|
},
|
|
45
57
|
"start_timeout_ms": {
|
|
46
58
|
"type": "integer",
|
|
47
|
-
"minimum": 0
|
|
59
|
+
"minimum": 0,
|
|
60
|
+
"description": "How long the launch waits for the wrapper to report the start.",
|
|
61
|
+
"default": 60000
|
|
48
62
|
},
|
|
49
63
|
"poll_ms": {
|
|
50
64
|
"type": "integer",
|
|
51
|
-
"minimum": 0
|
|
65
|
+
"minimum": 0,
|
|
66
|
+
"description": "Polling interval of both windows.",
|
|
67
|
+
"default": 50
|
|
52
68
|
}
|
|
53
69
|
},
|
|
54
70
|
"additionalProperties": false
|
|
@@ -56,19 +72,22 @@
|
|
|
56
72
|
"adopt_timeout_ms": {
|
|
57
73
|
"type": "integer",
|
|
58
74
|
"minimum": 0,
|
|
59
|
-
"description": "How long to wait for Orca to adopt a worktree.
|
|
75
|
+
"description": "How long to wait for Orca to adopt a new worktree.",
|
|
76
|
+
"default": 35000
|
|
60
77
|
},
|
|
61
78
|
"worktree_dir": {
|
|
62
79
|
"type": "string",
|
|
63
|
-
"description": "Directory
|
|
80
|
+
"description": "Directory for new worktrees, relative to `root` or absolute.",
|
|
81
|
+
"default": ".bakers-worktrees"
|
|
64
82
|
},
|
|
65
83
|
"base_branch": {
|
|
66
84
|
"type": "string",
|
|
67
|
-
"description": "Base ref for new branches
|
|
85
|
+
"description": "Base ref for new branches; when omitted, the remote-tracking branch of the checked-out branch."
|
|
68
86
|
},
|
|
69
87
|
"auto_setup_merge": {
|
|
70
88
|
"type": "boolean",
|
|
71
|
-
"description": "`
|
|
89
|
+
"description": "`false` sets Git's `branch.autoSetupMerge=false` in the root repository, so run branches have no upstream and push with `push.default=current` (see workspace-git); `true` leaves Git alone.",
|
|
90
|
+
"default": false
|
|
72
91
|
}
|
|
73
92
|
},
|
|
74
93
|
"additionalProperties": false,
|
|
@@ -79,10 +98,12 @@
|
|
|
79
98
|
"tab_label": {
|
|
80
99
|
"type": "string",
|
|
81
100
|
"pattern": "\\{identifier\\}",
|
|
82
|
-
"description": "
|
|
101
|
+
"description": "Agent terminal title; must contain {identifier}, also expands {state}, {title}, {title_slug}, {run_uuid}, {workspace_path}. ` #<run id>` is always appended.",
|
|
102
|
+
"default": "{identifier} · {state}"
|
|
83
103
|
}
|
|
84
104
|
},
|
|
85
|
-
"additionalProperties": false
|
|
105
|
+
"additionalProperties": false,
|
|
106
|
+
"description": "Agent terminal settings of a run."
|
|
86
107
|
}
|
|
87
108
|
}
|
|
88
109
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bakers-build/addon-orca",
|
|
3
|
-
"version": "0.8.1-next.
|
|
3
|
+
"version": "0.8.1-next.10",
|
|
4
4
|
"description": "bakers.build Orca integration: executor + per-ticket worktree workspace hosted in Orca.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -22,15 +22,15 @@
|
|
|
22
22
|
"directory": "bakers-cli/addons/orca"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@bakers-build/addon-herdr": "^0.8.1-next.
|
|
26
|
-
"@bakers-build/addon-workspace-git": "^0.8.1-next.
|
|
25
|
+
"@bakers-build/addon-herdr": "^0.8.1-next.10",
|
|
26
|
+
"@bakers-build/addon-workspace-git": "^0.8.1-next.10"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
29
|
-
"@bakers-build/conductor": "^0.8.1-next.
|
|
30
|
-
"@bakers-build/core": "^0.8.1-next.
|
|
29
|
+
"@bakers-build/conductor": "^0.8.1-next.10",
|
|
30
|
+
"@bakers-build/core": "^0.8.1-next.10"
|
|
31
31
|
},
|
|
32
32
|
"bakersBuild": {
|
|
33
|
-
"commit": "
|
|
33
|
+
"commit": "ceb44a12624feaa85cb2b0c9f84345399b38bf50",
|
|
34
34
|
"channel": "next"
|
|
35
35
|
}
|
|
36
36
|
}
|