@grackle-ai/cli 0.95.2 → 0.96.0
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/commands/task.d.ts.map +1 -1
- package/dist/commands/task.js +34 -14
- package/dist/commands/task.js.map +1 -1
- package/dist/commands/workspace.d.ts.map +1 -1
- package/dist/commands/workspace.js +28 -0
- package/dist/commands/workspace.js.map +1 -1
- package/dist/format.d.ts +2 -0
- package/dist/format.d.ts.map +1 -1
- package/dist/format.js +14 -0
- package/dist/format.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/commands/task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/commands/task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuQ3D"}
|
package/dist/commands/task.js
CHANGED
|
@@ -3,7 +3,7 @@ import { createGrackleClient } from "../client.js";
|
|
|
3
3
|
import { taskStatusToString, taskStatusToEnum, ROOT_TASK_ID, } from "@grackle-ai/common";
|
|
4
4
|
import Table from "cli-table3";
|
|
5
5
|
import chalk from "chalk";
|
|
6
|
-
import { formatTokens, formatCost } from "../format.js";
|
|
6
|
+
import { formatTokens, formatCost, formatBudget } from "../format.js";
|
|
7
7
|
export function registerTaskCommands(program) {
|
|
8
8
|
const task = program.command("task").description("Create, start, and manage tasks");
|
|
9
9
|
task
|
|
@@ -59,6 +59,8 @@ export function registerTaskCommands(program) {
|
|
|
59
59
|
.option("--depends-on <ids>", "Comma-separated dependency task IDs")
|
|
60
60
|
.option("--can-decompose", "Allow this task to create subtasks")
|
|
61
61
|
.option("--parent <task-id>", "Parent task ID (creates a subtask)")
|
|
62
|
+
.option("--token-budget <n>", "Total token cap (input + output); 0 = unlimited", parseInt)
|
|
63
|
+
.option("--cost-budget-millicents <n>", "Cost cap in millicents ($0.00001 units); 0 = unlimited", parseInt)
|
|
62
64
|
.action(async (title, opts) => {
|
|
63
65
|
const client = createGrackleClient();
|
|
64
66
|
const dependsOn = opts.dependsOn
|
|
@@ -71,6 +73,8 @@ export function registerTaskCommands(program) {
|
|
|
71
73
|
dependsOn,
|
|
72
74
|
canDecompose: opts.canDecompose || false,
|
|
73
75
|
parentTaskId: opts.parent || "",
|
|
76
|
+
tokenBudget: opts.tokenBudget,
|
|
77
|
+
costBudgetMillicents: opts.costBudgetMillicents,
|
|
74
78
|
});
|
|
75
79
|
console.log(`Created task: ${t.id} (${t.title}) branch: ${t.branch}`);
|
|
76
80
|
});
|
|
@@ -90,20 +94,32 @@ export function registerTaskCommands(program) {
|
|
|
90
94
|
if (t.description) {
|
|
91
95
|
console.log(`Description: ${t.description}`);
|
|
92
96
|
}
|
|
93
|
-
// Show usage from the
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
console.log(`Cost: ${formatCost(session.costUsd)}`);
|
|
100
|
-
}
|
|
97
|
+
// Show usage from the task scope
|
|
98
|
+
try {
|
|
99
|
+
const usage = await client.getUsage({ scope: "task", id: taskId });
|
|
100
|
+
if (usage.inputTokens || usage.outputTokens || usage.costUsd) {
|
|
101
|
+
console.log(`Tokens: ${formatTokens(usage.inputTokens)} in / ${formatTokens(usage.outputTokens)} out`);
|
|
102
|
+
console.log(`Cost: ${formatCost(usage.costUsd)}`);
|
|
101
103
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
104
|
+
if (t.tokenBudget > 0) {
|
|
105
|
+
const usedTokens = usage.inputTokens + usage.outputTokens;
|
|
106
|
+
console.log(`Token Budget: ${formatBudget(usedTokens, t.tokenBudget, "token")}`);
|
|
107
|
+
}
|
|
108
|
+
if (t.costBudgetMillicents > 0) {
|
|
109
|
+
console.log(`Cost Budget: ${formatBudget(usage.costUsd, t.costBudgetMillicents, "cost")}`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
catch (err) {
|
|
113
|
+
// Only suppress NotFound (session cleaned up); surface other errors
|
|
114
|
+
if (!(err instanceof ConnectError && err.code === Code.NotFound)) {
|
|
115
|
+
console.log(chalk.yellow(`Tokens: (unavailable)`));
|
|
116
|
+
}
|
|
117
|
+
// Still show budgets even if usage fetch fails
|
|
118
|
+
if (t.tokenBudget > 0) {
|
|
119
|
+
console.log(`Token Budget: ${formatBudget(0, t.tokenBudget, "token")}`);
|
|
120
|
+
}
|
|
121
|
+
if (t.costBudgetMillicents > 0) {
|
|
122
|
+
console.log(`Cost Budget: ${formatBudget(0, t.costBudgetMillicents, "cost")}`);
|
|
107
123
|
}
|
|
108
124
|
}
|
|
109
125
|
if (t.workpad) {
|
|
@@ -134,6 +150,8 @@ export function registerTaskCommands(program) {
|
|
|
134
150
|
.option("--depends-on <ids>", "Comma-separated dependency task IDs")
|
|
135
151
|
.option("--session <session-id>", "Bind an existing session to this task")
|
|
136
152
|
.option("--persona <id>", "Default persona ID for this task")
|
|
153
|
+
.option("--token-budget <n>", "Total token cap (input + output); 0 = unlimited", parseInt)
|
|
154
|
+
.option("--cost-budget-millicents <n>", "Cost cap in millicents ($0.00001 units); 0 = unlimited", parseInt)
|
|
137
155
|
.action(async (taskId, opts) => {
|
|
138
156
|
if (taskId === ROOT_TASK_ID && opts.status) {
|
|
139
157
|
console.error(chalk.red("Cannot change the status of the system task"));
|
|
@@ -167,6 +185,8 @@ export function registerTaskCommands(program) {
|
|
|
167
185
|
dependsOn,
|
|
168
186
|
sessionId: opts.session || "",
|
|
169
187
|
defaultPersonaId: opts.persona,
|
|
188
|
+
tokenBudget: opts.tokenBudget,
|
|
189
|
+
costBudgetMillicents: opts.costBudgetMillicents,
|
|
170
190
|
});
|
|
171
191
|
console.log(`Updated: ${t.id} (${t.title}) status: ${taskStatusToString(t.status)}`);
|
|
172
192
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/commands/task.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/commands/task.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMzC,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgKhE"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createGrackleClient } from "../client.js";
|
|
2
2
|
import { workspaceStatusToString } from "@grackle-ai/common";
|
|
3
3
|
import Table from "cli-table3";
|
|
4
|
+
import { formatTokens, formatCost, formatBudget } from "../format.js";
|
|
4
5
|
export function registerWorkspaceCommands(program) {
|
|
5
6
|
const workspace = program.command("workspace").description("Create and manage workspaces");
|
|
6
7
|
workspace
|
|
@@ -31,6 +32,8 @@ export function registerWorkspaceCommands(program) {
|
|
|
31
32
|
.option("--no-worktrees", "Disable worktree isolation (agents share the main checkout)")
|
|
32
33
|
.option("--working-directory <path>", "Working directory / repo root on the environment (e.g. /workspaces/my-repo)")
|
|
33
34
|
.option("--worktree-base-path <path>", "(deprecated, use --working-directory)")
|
|
35
|
+
.option("--token-budget <n>", "Aggregate token cap across all tasks; 0 = unlimited", parseInt)
|
|
36
|
+
.option("--cost-budget-millicents <n>", "Aggregate cost cap in millicents ($0.00001 units); 0 = unlimited", parseInt)
|
|
34
37
|
.action(async (name, opts) => {
|
|
35
38
|
const client = createGrackleClient();
|
|
36
39
|
// Commander sets opts.worktrees = false when --no-worktrees is passed, true otherwise
|
|
@@ -42,6 +45,8 @@ export function registerWorkspaceCommands(program) {
|
|
|
42
45
|
environmentId: opts.env,
|
|
43
46
|
useWorktrees,
|
|
44
47
|
workingDirectory: opts.workingDirectory || opts.worktreeBasePath || "",
|
|
48
|
+
tokenBudget: opts.tokenBudget,
|
|
49
|
+
costBudgetMillicents: opts.costBudgetMillicents,
|
|
45
50
|
});
|
|
46
51
|
console.log(`Created workspace: ${p.id} (${p.name}) [worktrees: ${p.useWorktrees ? "enabled" : "disabled"}]`);
|
|
47
52
|
});
|
|
@@ -51,8 +56,27 @@ export function registerWorkspaceCommands(program) {
|
|
|
51
56
|
.action(async (id) => {
|
|
52
57
|
const client = createGrackleClient();
|
|
53
58
|
const p = await client.getWorkspace({ id });
|
|
59
|
+
// Fetch usage for budget display
|
|
60
|
+
let usage;
|
|
61
|
+
try {
|
|
62
|
+
usage = await client.getUsage({ scope: "workspace", id });
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
// Usage fetch may fail; continue without it
|
|
66
|
+
}
|
|
54
67
|
const table = new Table();
|
|
55
68
|
table.push({ "ID": p.id }, { "Name": p.name }, { "Description": p.description || "-" }, { "Repo URL": p.repoUrl || "-" }, { "Environment": p.environmentId || "-" }, { "Linked Envs": p.linkedEnvironmentIds.length > 0 ? p.linkedEnvironmentIds.join(", ") : "none" }, { "Worktrees": p.useWorktrees ? "enabled" : "disabled" }, ...(p.workingDirectory ? [{ "Working Dir": p.workingDirectory }] : []), { "Status": workspaceStatusToString(p.status) }, { "Created": p.createdAt }, { "Updated": p.updatedAt });
|
|
69
|
+
if (usage && (usage.inputTokens || usage.outputTokens || usage.costUsd)) {
|
|
70
|
+
table.push({ "Tokens": `${formatTokens(usage.inputTokens)} in / ${formatTokens(usage.outputTokens)} out` }, { "Cost": formatCost(usage.costUsd) });
|
|
71
|
+
}
|
|
72
|
+
if (p.tokenBudget > 0) {
|
|
73
|
+
const usedTokens = usage ? usage.inputTokens + usage.outputTokens : 0;
|
|
74
|
+
table.push({ "Token Budget": formatBudget(usedTokens, p.tokenBudget, "token") });
|
|
75
|
+
}
|
|
76
|
+
if (p.costBudgetMillicents > 0) {
|
|
77
|
+
const usedCost = usage ? usage.costUsd : 0;
|
|
78
|
+
table.push({ "Cost Budget": formatBudget(usedCost, p.costBudgetMillicents, "cost") });
|
|
79
|
+
}
|
|
56
80
|
console.log(table.toString());
|
|
57
81
|
});
|
|
58
82
|
workspace
|
|
@@ -66,6 +90,8 @@ export function registerWorkspaceCommands(program) {
|
|
|
66
90
|
.option("--worktrees", "Enable worktree isolation (default)")
|
|
67
91
|
.option("--working-directory <path>", "Working directory / repo root on the environment (e.g. /workspaces/my-repo)")
|
|
68
92
|
.option("--worktree-base-path <path>", "(deprecated, use --working-directory)")
|
|
93
|
+
.option("--token-budget <n>", "Aggregate token cap across all tasks; 0 = unlimited", parseInt)
|
|
94
|
+
.option("--cost-budget-millicents <n>", "Aggregate cost cap in millicents ($0.00001 units); 0 = unlimited", parseInt)
|
|
69
95
|
.action(async (id, opts) => {
|
|
70
96
|
const client = createGrackleClient();
|
|
71
97
|
// Determine useWorktrees: explicit --worktrees → true, --no-worktrees → false, neither → undefined (no change)
|
|
@@ -84,6 +110,8 @@ export function registerWorkspaceCommands(program) {
|
|
|
84
110
|
environmentId: opts.env,
|
|
85
111
|
useWorktrees,
|
|
86
112
|
workingDirectory: opts.workingDirectory || opts.worktreeBasePath,
|
|
113
|
+
tokenBudget: opts.tokenBudget,
|
|
114
|
+
costBudgetMillicents: opts.costBudgetMillicents,
|
|
87
115
|
});
|
|
88
116
|
console.log(`Updated workspace: ${p.id} (${p.name}) [worktrees: ${p.useWorktrees ? "enabled" : "disabled"}]`);
|
|
89
117
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"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"}
|
package/dist/format.d.ts
CHANGED
|
@@ -2,4 +2,6 @@
|
|
|
2
2
|
export declare function formatTokens(n: number): string;
|
|
3
3
|
/** Format a USD cost for display (e.g. 0.005 → "$0.0050", 1.23 → "$1.23"). */
|
|
4
4
|
export declare function formatCost(usd: number): string;
|
|
5
|
+
/** Format a budget display: "used / total" with appropriate formatting for tokens or cost. */
|
|
6
|
+
export declare function formatBudget(used: number, budget: number, type: "token" | "cost"): string;
|
|
5
7
|
//# sourceMappingURL=format.d.ts.map
|
package/dist/format.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAY9C;AAED,8EAA8E;AAC9E,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ9C"}
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAY9C;AAED,8EAA8E;AAC9E,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ9C;AAUD,8FAA8F;AAC9F,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAKzF"}
|
package/dist/format.js
CHANGED
|
@@ -22,4 +22,18 @@ export function formatCost(usd) {
|
|
|
22
22
|
}
|
|
23
23
|
return `$${usd.toFixed(2)}`;
|
|
24
24
|
}
|
|
25
|
+
/** Format a cost value for budget display, showing "$0.00" for zero instead of "-". */
|
|
26
|
+
function formatBudgetCost(usd) {
|
|
27
|
+
if (usd === 0) {
|
|
28
|
+
return "$0.00";
|
|
29
|
+
}
|
|
30
|
+
return formatCost(usd);
|
|
31
|
+
}
|
|
32
|
+
/** Format a budget display: "used / total" with appropriate formatting for tokens or cost. */
|
|
33
|
+
export function formatBudget(used, budget, type) {
|
|
34
|
+
if (type === "token") {
|
|
35
|
+
return `${formatTokens(used)} / ${formatTokens(budget)}`;
|
|
36
|
+
}
|
|
37
|
+
return `${formatBudgetCost(used)} / ${formatBudgetCost(budget / 100000)}`;
|
|
38
|
+
}
|
|
25
39
|
//# sourceMappingURL=format.js.map
|
package/dist/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,MAAM,UAAU,YAAY,CAAC,CAAS;IACpC,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC;QACnB,OAAO,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,OAAO,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1C,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACd,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC;QACf,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,MAAM,UAAU,YAAY,CAAC,CAAS;IACpC,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC;QACnB,OAAO,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,OAAO,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1C,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACd,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC;QACf,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9B,CAAC;AAED,uFAAuF;AACvF,SAAS,gBAAgB,CAAC,GAAW;IACnC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACd,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,MAAc,EAAE,IAAsB;IAC/E,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3D,CAAC;IACD,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAC5E,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@grackle-ai/cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.96.0",
|
|
4
4
|
"description": "Command-line interface for managing Grackle environments and agents",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -38,9 +38,9 @@
|
|
|
38
38
|
"commander": "^13.0.0",
|
|
39
39
|
"ora": "^8.0.0",
|
|
40
40
|
"qrcode": "^1.5.4",
|
|
41
|
-
"@grackle-ai/common": "0.
|
|
42
|
-
"@grackle-ai/
|
|
43
|
-
"@grackle-ai/
|
|
41
|
+
"@grackle-ai/common": "0.96.0",
|
|
42
|
+
"@grackle-ai/core": "0.96.0",
|
|
43
|
+
"@grackle-ai/server": "0.96.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@rushstack/heft": "1.2.7",
|