@akiojin/gwt 2.11.1 â 2.12.1
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/claude.d.ts +4 -1
- package/dist/claude.d.ts.map +1 -1
- package/dist/claude.js +51 -7
- package/dist/claude.js.map +1 -1
- package/dist/cli/ui/components/App.d.ts +7 -0
- package/dist/cli/ui/components/App.d.ts.map +1 -1
- package/dist/cli/ui/components/App.js +307 -18
- package/dist/cli/ui/components/App.js.map +1 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.d.ts +21 -0
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.d.ts.map +1 -0
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js +145 -0
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js.map +1 -0
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.d.ts +2 -1
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.js +4 -2
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.js.map +1 -1
- package/dist/cli/ui/components/screens/ModelSelectorScreen.js +1 -1
- package/dist/cli/ui/components/screens/SessionSelectorScreen.d.ts +10 -2
- package/dist/cli/ui/components/screens/SessionSelectorScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/SessionSelectorScreen.js +18 -7
- package/dist/cli/ui/components/screens/SessionSelectorScreen.js.map +1 -1
- package/dist/cli/ui/types.d.ts +1 -1
- package/dist/cli/ui/types.d.ts.map +1 -1
- package/dist/cli/ui/utils/continueSession.d.ts +18 -0
- package/dist/cli/ui/utils/continueSession.d.ts.map +1 -0
- package/dist/cli/ui/utils/continueSession.js +67 -0
- package/dist/cli/ui/utils/continueSession.js.map +1 -0
- package/dist/codex.d.ts +4 -1
- package/dist/codex.d.ts.map +1 -1
- package/dist/codex.js +70 -5
- package/dist/codex.js.map +1 -1
- package/dist/config/index.d.ts +9 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +11 -2
- package/dist/config/index.js.map +1 -1
- package/dist/gemini.d.ts +4 -1
- package/dist/gemini.d.ts.map +1 -1
- package/dist/gemini.js +146 -32
- package/dist/gemini.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +119 -48
- package/dist/index.js.map +1 -1
- package/dist/qwen.d.ts +4 -1
- package/dist/qwen.d.ts.map +1 -1
- package/dist/qwen.js +45 -4
- package/dist/qwen.js.map +1 -1
- package/dist/utils/prompt.d.ts +6 -0
- package/dist/utils/prompt.d.ts.map +1 -0
- package/dist/utils/prompt.js +57 -0
- package/dist/utils/prompt.js.map +1 -0
- package/dist/utils/session.d.ts +82 -0
- package/dist/utils/session.d.ts.map +1 -0
- package/dist/utils/session.js +579 -0
- package/dist/utils/session.js.map +1 -0
- package/package.json +2 -2
- package/src/claude.ts +69 -8
- package/src/cli/ui/__tests__/components/App.protected-branch.test.tsx +12 -2
- package/src/cli/ui/__tests__/components/screens/BranchQuickStartScreen.test.tsx +142 -0
- package/src/cli/ui/__tests__/components/screens/ExecutionModeSelectorScreen.test.tsx +14 -0
- package/src/cli/ui/__tests__/components/screens/SessionSelectorScreen.test.tsx +29 -10
- package/src/cli/ui/__tests__/integration/edgeCases.test.tsx +4 -1
- package/src/cli/ui/components/App.tsx +403 -23
- package/src/cli/ui/components/screens/BranchQuickStartScreen.tsx +237 -0
- package/src/cli/ui/components/screens/ExecutionModeSelectorScreen.tsx +5 -1
- package/src/cli/ui/components/screens/ModelSelectorScreen.tsx +1 -1
- package/src/cli/ui/components/screens/SessionSelectorScreen.tsx +34 -6
- package/src/cli/ui/types.ts +1 -0
- package/src/cli/ui/utils/continueSession.ts +106 -0
- package/src/codex.ts +91 -6
- package/src/config/index.ts +22 -2
- package/src/gemini.ts +179 -41
- package/src/index.ts +145 -61
- package/src/qwen.ts +56 -5
- package/src/utils/__tests__/prompt.test.ts +89 -0
- package/src/utils/prompt.ts +74 -0
- package/src/utils/session.ts +704 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"continueSession.js","sourceRoot":"","sources":["../../../../src/cli/ui/utils/continueSession.ts"],"names":[],"mappings":"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"}
|
package/dist/codex.d.ts
CHANGED
|
@@ -13,6 +13,9 @@ export declare function launchCodexCLI(worktreePath: string, options?: {
|
|
|
13
13
|
envOverrides?: Record<string, string>;
|
|
14
14
|
model?: string;
|
|
15
15
|
reasoningEffort?: CodexReasoningEffort;
|
|
16
|
-
|
|
16
|
+
sessionId?: string | null;
|
|
17
|
+
}): Promise<{
|
|
18
|
+
sessionId?: string | null;
|
|
19
|
+
}>;
|
|
17
20
|
export declare function isCodexAvailable(): Promise<boolean>;
|
|
18
21
|
//# sourceMappingURL=codex.d.ts.map
|
package/dist/codex.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,oBAAoB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAEvE,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AACnD,eAAO,MAAM,8BAA8B,EAAE,oBAA6B,CAAC;AAE3E,eAAO,MAAM,qBAAqB,GAChC,QAAO,MAA4B,EACnC,kBAAiB,oBAAqD,KACrE,MAAM,EAoBR,CAAC;AAEF,qBAAa,UAAW,SAAQ,KAAK;IAG1B,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GACL,OAAO,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAuKxC;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUzD"}
|
package/dist/codex.js
CHANGED
|
@@ -3,12 +3,15 @@ import chalk from "chalk";
|
|
|
3
3
|
import { platform } from "os";
|
|
4
4
|
import { existsSync } from "fs";
|
|
5
5
|
import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
|
|
6
|
+
import { findLatestCodexSession, waitForCodexSessionId, } from "./utils/session.js";
|
|
6
7
|
const CODEX_CLI_PACKAGE = "@openai/codex@latest";
|
|
7
8
|
export const DEFAULT_CODEX_MODEL = "gpt-5.1-codex";
|
|
8
9
|
export const DEFAULT_CODEX_REASONING_EFFORT = "high";
|
|
9
10
|
export const buildDefaultCodexArgs = (model = DEFAULT_CODEX_MODEL, reasoningEffort = DEFAULT_CODEX_REASONING_EFFORT) => [
|
|
10
11
|
"--enable",
|
|
11
12
|
"web_search_request",
|
|
13
|
+
"--enable",
|
|
14
|
+
"skills",
|
|
12
15
|
`--model=${model}`,
|
|
13
16
|
"--sandbox",
|
|
14
17
|
"workspace-write",
|
|
@@ -35,6 +38,7 @@ export class CodexError extends Error {
|
|
|
35
38
|
}
|
|
36
39
|
export async function launchCodexCLI(worktreePath, options = {}) {
|
|
37
40
|
const terminal = getTerminalStreams();
|
|
41
|
+
const startedAt = Date.now();
|
|
38
42
|
try {
|
|
39
43
|
if (!existsSync(worktreePath)) {
|
|
40
44
|
throw new Error(`Worktree path does not exist: ${worktreePath}`);
|
|
@@ -46,14 +50,31 @@ export async function launchCodexCLI(worktreePath, options = {}) {
|
|
|
46
50
|
const reasoningEffort = options.reasoningEffort ?? DEFAULT_CODEX_REASONING_EFFORT;
|
|
47
51
|
console.log(chalk.green(` đ¯ Model: ${model}`));
|
|
48
52
|
console.log(chalk.green(` đ§ Reasoning: ${reasoningEffort}`));
|
|
53
|
+
const resumeSessionId = options.sessionId && options.sessionId.trim().length > 0
|
|
54
|
+
? options.sessionId.trim()
|
|
55
|
+
: null;
|
|
56
|
+
// Start polling session files immediately to catch the session created right after launch.
|
|
57
|
+
const sessionProbe = waitForCodexSessionId({ startedAt, cwd: worktreePath }).catch(() => null);
|
|
49
58
|
switch (options.mode) {
|
|
50
59
|
case "continue":
|
|
51
|
-
|
|
52
|
-
|
|
60
|
+
if (resumeSessionId) {
|
|
61
|
+
args.push("resume", resumeSessionId);
|
|
62
|
+
console.log(chalk.cyan(` âī¸ Resuming specific Codex session: ${resumeSessionId}`));
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
args.push("resume", "--last");
|
|
66
|
+
console.log(chalk.cyan(" âī¸ Resuming last Codex session"));
|
|
67
|
+
}
|
|
53
68
|
break;
|
|
54
69
|
case "resume":
|
|
55
|
-
|
|
56
|
-
|
|
70
|
+
if (resumeSessionId) {
|
|
71
|
+
args.push("resume", resumeSessionId);
|
|
72
|
+
console.log(chalk.cyan(` đ Resuming Codex session: ${resumeSessionId}`));
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
args.push("resume");
|
|
76
|
+
console.log(chalk.cyan(" đ Resume command"));
|
|
77
|
+
}
|
|
57
78
|
break;
|
|
58
79
|
case "normal":
|
|
59
80
|
default:
|
|
@@ -69,21 +90,62 @@ export async function launchCodexCLI(worktreePath, options = {}) {
|
|
|
69
90
|
}
|
|
70
91
|
const codexArgs = buildDefaultCodexArgs(model, reasoningEffort);
|
|
71
92
|
args.push(...codexArgs);
|
|
93
|
+
console.log(chalk.gray(` đ Args: ${args.join(" ")}`));
|
|
72
94
|
terminal.exitRawMode();
|
|
73
95
|
const childStdio = createChildStdio();
|
|
74
96
|
const env = { ...process.env, ...(options.envOverrides ?? {}) };
|
|
75
97
|
try {
|
|
76
|
-
|
|
98
|
+
const execChild = async (child) => {
|
|
99
|
+
try {
|
|
100
|
+
await child;
|
|
101
|
+
}
|
|
102
|
+
catch (execError) {
|
|
103
|
+
// Treat SIGINT/SIGTERM as normal exit (user pressed Ctrl+C)
|
|
104
|
+
if (execError.signal === "SIGINT" || execError.signal === "SIGTERM") {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
throw execError;
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
const child = execa("bunx", [CODEX_CLI_PACKAGE, ...args], {
|
|
77
111
|
cwd: worktreePath,
|
|
112
|
+
shell: true,
|
|
78
113
|
stdin: childStdio.stdin,
|
|
79
114
|
stdout: childStdio.stdout,
|
|
80
115
|
stderr: childStdio.stderr,
|
|
81
116
|
env,
|
|
82
117
|
});
|
|
118
|
+
await execChild(child);
|
|
83
119
|
}
|
|
84
120
|
finally {
|
|
85
121
|
childStdio.cleanup();
|
|
86
122
|
}
|
|
123
|
+
// File-based session detection only - no stdout capture
|
|
124
|
+
// Use only findLatestCodexSession with short timeout, skip sessionProbe to avoid hanging
|
|
125
|
+
let capturedSessionId = null;
|
|
126
|
+
const finishedAt = Date.now();
|
|
127
|
+
try {
|
|
128
|
+
const latest = await findLatestCodexSession({
|
|
129
|
+
since: startedAt,
|
|
130
|
+
until: finishedAt + 30_000,
|
|
131
|
+
preferClosestTo: finishedAt,
|
|
132
|
+
windowMs: 10 * 60 * 1000,
|
|
133
|
+
cwd: worktreePath,
|
|
134
|
+
});
|
|
135
|
+
// Priority: latest on disk > resumeSessionId
|
|
136
|
+
capturedSessionId = latest?.id ?? resumeSessionId ?? null;
|
|
137
|
+
}
|
|
138
|
+
catch {
|
|
139
|
+
capturedSessionId = resumeSessionId ?? null;
|
|
140
|
+
}
|
|
141
|
+
if (capturedSessionId) {
|
|
142
|
+
console.log(chalk.cyan(`\n đ Session ID: ${capturedSessionId}`));
|
|
143
|
+
console.log(chalk.gray(` Resume command: codex resume ${capturedSessionId}`));
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
console.log(chalk.yellow("\n âšī¸ Could not determine Codex session ID automatically."));
|
|
147
|
+
}
|
|
148
|
+
return capturedSessionId ? { sessionId: capturedSessionId } : {};
|
|
87
149
|
}
|
|
88
150
|
catch (error) {
|
|
89
151
|
const errorMessage = error.code === "ENOENT"
|
|
@@ -97,6 +159,9 @@ export async function launchCodexCLI(worktreePath, options = {}) {
|
|
|
97
159
|
}
|
|
98
160
|
throw new CodexError(errorMessage, error);
|
|
99
161
|
}
|
|
162
|
+
finally {
|
|
163
|
+
terminal.exitRawMode();
|
|
164
|
+
}
|
|
100
165
|
}
|
|
101
166
|
export async function isCodexAvailable() {
|
|
102
167
|
try {
|
package/dist/codex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"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"}
|
package/dist/config/index.d.ts
CHANGED
|
@@ -9,6 +9,9 @@ export interface SessionData {
|
|
|
9
9
|
lastWorktreePath: string | null;
|
|
10
10
|
lastBranch: string | null;
|
|
11
11
|
lastUsedTool?: string;
|
|
12
|
+
lastSessionId?: string | null;
|
|
13
|
+
reasoningLevel?: string | null;
|
|
14
|
+
skipPermissions?: boolean | null;
|
|
12
15
|
timestamp: number;
|
|
13
16
|
repositoryRoot: string;
|
|
14
17
|
mode?: "normal" | "continue" | "resume";
|
|
@@ -21,8 +24,11 @@ export interface ToolSessionEntry {
|
|
|
21
24
|
worktreePath: string | null;
|
|
22
25
|
toolId: string;
|
|
23
26
|
toolLabel: string;
|
|
27
|
+
sessionId?: string | null;
|
|
24
28
|
mode?: "normal" | "continue" | "resume" | null;
|
|
25
29
|
model?: string | null;
|
|
30
|
+
reasoningLevel?: string | null;
|
|
31
|
+
skipPermissions?: boolean | null;
|
|
26
32
|
timestamp: number;
|
|
27
33
|
}
|
|
28
34
|
/**
|
|
@@ -31,7 +37,9 @@ export interface ToolSessionEntry {
|
|
|
31
37
|
export declare function loadConfig(): Promise<AppConfig>;
|
|
32
38
|
export declare function getConfig(): Promise<AppConfig>;
|
|
33
39
|
export declare function resetConfigCache(): void;
|
|
34
|
-
export declare function saveSession(sessionData: SessionData
|
|
40
|
+
export declare function saveSession(sessionData: SessionData, options?: {
|
|
41
|
+
skipHistory?: boolean;
|
|
42
|
+
}): Promise<void>;
|
|
35
43
|
export declare function loadSession(repositoryRoot: string): Promise<SessionData | null>;
|
|
36
44
|
export declare function getAllSessions(): Promise<SessionData[]>;
|
|
37
45
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AAUD;;GAEG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,CAqCrD;AAOD,wBAAsB,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,CAKpD;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;AAcD,wBAAsB,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB;AAUD;;GAEG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,CAqCrD;AAOD,wBAAsB,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,CAKpD;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;AAcD,wBAAsB,WAAW,CAC/B,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CA4Df;AAED,wBAAsB,WAAW,CAC/B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAyB7B;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CA8C7D;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAmCxC"}
|
package/dist/config/index.js
CHANGED
|
@@ -67,7 +67,7 @@ function getSessionFilePath(repositoryRoot) {
|
|
|
67
67
|
.replace(/[/+=]/g, "_");
|
|
68
68
|
return path.join(sessionDir, `${repoName}_${repoHash}.json`);
|
|
69
69
|
}
|
|
70
|
-
export async function saveSession(sessionData) {
|
|
70
|
+
export async function saveSession(sessionData, options = {}) {
|
|
71
71
|
try {
|
|
72
72
|
const sessionPath = getSessionFilePath(sessionData.repositoryRoot);
|
|
73
73
|
const sessionDir = path.dirname(sessionPath);
|
|
@@ -86,14 +86,19 @@ export async function saveSession(sessionData) {
|
|
|
86
86
|
// ignore
|
|
87
87
|
}
|
|
88
88
|
// æ°ããåąĨæ´ã¨ãŗããĒãčŋŊå īŧbranch/worktree/toolãæãŖãĻããå ´åãŽãŋīŧ
|
|
89
|
-
if (
|
|
89
|
+
if (!options.skipHistory &&
|
|
90
|
+
sessionData.lastBranch &&
|
|
91
|
+
sessionData.lastWorktreePath) {
|
|
90
92
|
const entry = {
|
|
91
93
|
branch: sessionData.lastBranch,
|
|
92
94
|
worktreePath: sessionData.lastWorktreePath,
|
|
93
95
|
toolId: sessionData.lastUsedTool ?? "unknown",
|
|
94
96
|
toolLabel: sessionData.toolLabel ?? sessionData.lastUsedTool ?? "Custom",
|
|
97
|
+
sessionId: sessionData.lastSessionId ?? null,
|
|
95
98
|
mode: sessionData.mode ?? null,
|
|
96
99
|
model: sessionData.model ?? null,
|
|
100
|
+
reasoningLevel: sessionData.reasoningLevel ?? null,
|
|
101
|
+
skipPermissions: sessionData.skipPermissions ?? false,
|
|
97
102
|
timestamp: sessionData.timestamp,
|
|
98
103
|
};
|
|
99
104
|
existingHistory = [...existingHistory, entry].slice(-100); // keep latest 100
|
|
@@ -101,6 +106,9 @@ export async function saveSession(sessionData) {
|
|
|
101
106
|
const payload = {
|
|
102
107
|
...sessionData,
|
|
103
108
|
history: existingHistory,
|
|
109
|
+
lastSessionId: sessionData.lastSessionId ?? null,
|
|
110
|
+
reasoningLevel: sessionData.reasoningLevel ?? null,
|
|
111
|
+
skipPermissions: sessionData.skipPermissions ?? false,
|
|
104
112
|
};
|
|
105
113
|
await writeFile(sessionPath, JSON.stringify(payload, null, 2), "utf-8");
|
|
106
114
|
}
|
|
@@ -191,6 +199,7 @@ export async function getLastToolUsageMap(repositoryRoot) {
|
|
|
191
199
|
toolLabel: parsed.toolLabel ?? parsed.lastUsedTool ?? "Custom",
|
|
192
200
|
mode: parsed.mode ?? null,
|
|
193
201
|
model: parsed.model ?? null,
|
|
202
|
+
reasoningLevel: parsed.reasoningLevel ?? null,
|
|
194
203
|
timestamp: parsed.timestamp ?? Date.now(),
|
|
195
204
|
});
|
|
196
205
|
}
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"}
|
package/dist/gemini.d.ts
CHANGED
|
@@ -8,6 +8,9 @@ export declare function launchGeminiCLI(worktreePath: string, options?: {
|
|
|
8
8
|
extraArgs?: string[];
|
|
9
9
|
envOverrides?: Record<string, string>;
|
|
10
10
|
model?: string;
|
|
11
|
-
|
|
11
|
+
sessionId?: string | null;
|
|
12
|
+
}): Promise<{
|
|
13
|
+
sessionId?: string | null;
|
|
14
|
+
}>;
|
|
12
15
|
export declare function isGeminiCLIAvailable(): Promise<boolean>;
|
|
13
16
|
//# sourceMappingURL=gemini.d.ts.map
|
package/dist/gemini.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"AAQA,qBAAa,WAAY,SAAQ,KAAK;IAG3B,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GACL,OAAO,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAuRxC;AAsBD,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,CAe7D"}
|
package/dist/gemini.js
CHANGED
|
@@ -2,6 +2,7 @@ import { execa } from "execa";
|
|
|
2
2
|
import chalk from "chalk";
|
|
3
3
|
import { existsSync } from "fs";
|
|
4
4
|
import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
|
|
5
|
+
import { findLatestGeminiSessionId } from "./utils/session.js";
|
|
5
6
|
const GEMINI_CLI_PACKAGE = "@google/gemini-cli@latest";
|
|
6
7
|
export class GeminiError extends Error {
|
|
7
8
|
cause;
|
|
@@ -26,14 +27,62 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
26
27
|
console.log(chalk.green(` đ¯ Model: ${options.model}`));
|
|
27
28
|
}
|
|
28
29
|
// Handle execution mode
|
|
30
|
+
const resumeSessionId = options.sessionId && options.sessionId.trim().length > 0
|
|
31
|
+
? options.sessionId.trim()
|
|
32
|
+
: null;
|
|
33
|
+
const buildArgs = (useResumeId) => {
|
|
34
|
+
const a = [];
|
|
35
|
+
if (options.model) {
|
|
36
|
+
a.push("--model", options.model);
|
|
37
|
+
}
|
|
38
|
+
switch (options.mode) {
|
|
39
|
+
case "continue":
|
|
40
|
+
if (useResumeId && resumeSessionId) {
|
|
41
|
+
a.push("--resume", resumeSessionId);
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
a.push("--resume");
|
|
45
|
+
}
|
|
46
|
+
break;
|
|
47
|
+
case "resume":
|
|
48
|
+
if (useResumeId && resumeSessionId) {
|
|
49
|
+
a.push("--resume", resumeSessionId);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
a.push("--resume");
|
|
53
|
+
}
|
|
54
|
+
break;
|
|
55
|
+
case "normal":
|
|
56
|
+
default:
|
|
57
|
+
break;
|
|
58
|
+
}
|
|
59
|
+
if (options.skipPermissions) {
|
|
60
|
+
a.push("-y");
|
|
61
|
+
}
|
|
62
|
+
if (options.extraArgs && options.extraArgs.length > 0) {
|
|
63
|
+
a.push(...options.extraArgs);
|
|
64
|
+
}
|
|
65
|
+
return a;
|
|
66
|
+
};
|
|
67
|
+
const argsPrimary = buildArgs(true);
|
|
68
|
+
const argsFallback = buildArgs(false);
|
|
69
|
+
// Log selected mode/ID
|
|
29
70
|
switch (options.mode) {
|
|
30
71
|
case "continue":
|
|
31
|
-
|
|
32
|
-
|
|
72
|
+
if (resumeSessionId) {
|
|
73
|
+
console.log(chalk.cyan(` âī¸ Continuing specific session: ${resumeSessionId}`));
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
console.log(chalk.cyan(" âī¸ Continuing most recent session"));
|
|
77
|
+
}
|
|
33
78
|
break;
|
|
34
79
|
case "resume":
|
|
35
|
-
|
|
36
|
-
|
|
80
|
+
if (resumeSessionId) {
|
|
81
|
+
console.log(chalk.cyan(` đ Resuming session: ${resumeSessionId}`));
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
console.log(chalk.cyan(" đ Resuming session (latest)"));
|
|
85
|
+
}
|
|
37
86
|
break;
|
|
38
87
|
case "normal":
|
|
39
88
|
default:
|
|
@@ -42,13 +91,8 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
42
91
|
}
|
|
43
92
|
// Handle skip permissions (YOLO mode)
|
|
44
93
|
if (options.skipPermissions) {
|
|
45
|
-
args.push("-y");
|
|
46
94
|
console.log(chalk.yellow(" â ī¸ Auto-approving all actions (YOLO mode)"));
|
|
47
95
|
}
|
|
48
|
-
// Append any pass-through arguments after our flags
|
|
49
|
-
if (options.extraArgs && options.extraArgs.length > 0) {
|
|
50
|
-
args.push(...options.extraArgs);
|
|
51
|
-
}
|
|
52
96
|
terminal.exitRawMode();
|
|
53
97
|
const baseEnv = {
|
|
54
98
|
...process.env,
|
|
@@ -57,40 +101,105 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
57
101
|
const childStdio = createChildStdio();
|
|
58
102
|
// Auto-detect locally installed gemini command
|
|
59
103
|
const hasLocalGemini = await isGeminiCommandAvailable();
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
104
|
+
// Capture session ID from Gemini's exit summary
|
|
105
|
+
let capturedSessionId = null;
|
|
106
|
+
const extractSessionId = (output) => {
|
|
107
|
+
if (!output)
|
|
108
|
+
return;
|
|
109
|
+
// Gemini outputs "Session ID: <uuid>" in exit summary
|
|
110
|
+
// UUID may be split across lines due to terminal width
|
|
111
|
+
// First, find "Session ID:" and extract following hex characters
|
|
112
|
+
const sessionIdIndex = output.indexOf("Session ID:");
|
|
113
|
+
if (sessionIdIndex === -1)
|
|
114
|
+
return;
|
|
115
|
+
// Extract text after "Session ID:" until we have enough hex chars for UUID
|
|
116
|
+
const afterLabel = output.slice(sessionIdIndex + "Session ID:".length);
|
|
117
|
+
// Remove all non-hex characters except dash, then extract UUID pattern
|
|
118
|
+
const hexOnly = afterLabel.replace(/[^0-9a-fA-F-]/g, "");
|
|
119
|
+
// UUID format: 8-4-4-4-12 = 32 hex chars + 4 dashes
|
|
120
|
+
const uuidMatch = hexOnly.match(/^([0-9a-f]{8})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{12})/i);
|
|
121
|
+
if (uuidMatch) {
|
|
122
|
+
capturedSessionId = `${uuidMatch[1]}-${uuidMatch[2]}-${uuidMatch[3]}-${uuidMatch[4]}-${uuidMatch[5]}`;
|
|
72
123
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
81
|
-
await execa("bunx", [GEMINI_CLI_PACKAGE, ...args], {
|
|
124
|
+
};
|
|
125
|
+
const runGemini = async (runArgs) => {
|
|
126
|
+
// Capture stdout while passing through to terminal
|
|
127
|
+
// Store chunks to extract session ID after process exits
|
|
128
|
+
const outputChunks = [];
|
|
129
|
+
const runWithCapture = async (cmd, args) => {
|
|
130
|
+
const child = execa(cmd, args, {
|
|
82
131
|
cwd: worktreePath,
|
|
83
132
|
shell: true,
|
|
84
133
|
stdin: childStdio.stdin,
|
|
85
|
-
stdout:
|
|
134
|
+
stdout: "pipe",
|
|
86
135
|
stderr: childStdio.stderr,
|
|
87
136
|
env: baseEnv,
|
|
88
137
|
});
|
|
138
|
+
// Pass stdout through to terminal while capturing
|
|
139
|
+
child.stdout?.on("data", (chunk) => {
|
|
140
|
+
const text = chunk.toString("utf8");
|
|
141
|
+
outputChunks.push(text);
|
|
142
|
+
terminal.stdout.write(chunk);
|
|
143
|
+
});
|
|
144
|
+
await child;
|
|
145
|
+
return outputChunks.join("");
|
|
146
|
+
};
|
|
147
|
+
if (hasLocalGemini) {
|
|
148
|
+
console.log(chalk.green(" ⨠Using locally installed gemini command"));
|
|
149
|
+
return await runWithCapture("gemini", runArgs);
|
|
150
|
+
}
|
|
151
|
+
console.log(chalk.cyan(" đ Falling back to bunx @google/gemini-cli@latest"));
|
|
152
|
+
console.log(chalk.yellow(" đĄ Recommended: Install Gemini CLI globally for faster startup"));
|
|
153
|
+
console.log(chalk.yellow(" npm install -g @google/gemini-cli"));
|
|
154
|
+
console.log("");
|
|
155
|
+
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
156
|
+
return await runWithCapture("bunx", [GEMINI_CLI_PACKAGE, ...runArgs]);
|
|
157
|
+
};
|
|
158
|
+
let output;
|
|
159
|
+
try {
|
|
160
|
+
// Try with explicit session ID first (if any), then fallback to --resume (latest) once
|
|
161
|
+
try {
|
|
162
|
+
output = await runGemini(argsPrimary);
|
|
163
|
+
}
|
|
164
|
+
catch (err) {
|
|
165
|
+
const shouldRetry = (options.mode === "resume" || options.mode === "continue") &&
|
|
166
|
+
resumeSessionId;
|
|
167
|
+
if (shouldRetry) {
|
|
168
|
+
console.log(chalk.yellow(` â ī¸ Failed to resume session ${resumeSessionId}. Retrying with latest session...`));
|
|
169
|
+
output = await runGemini(argsFallback);
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
throw err;
|
|
173
|
+
}
|
|
89
174
|
}
|
|
90
175
|
}
|
|
91
176
|
finally {
|
|
92
177
|
childStdio.cleanup();
|
|
93
178
|
}
|
|
179
|
+
// Extract session ID from Gemini's exit summary output
|
|
180
|
+
extractSessionId(output);
|
|
181
|
+
// Fallback to file-based detection if stdout capture failed
|
|
182
|
+
if (!capturedSessionId) {
|
|
183
|
+
try {
|
|
184
|
+
capturedSessionId =
|
|
185
|
+
(await findLatestGeminiSessionId(worktreePath, {
|
|
186
|
+
cwd: worktreePath,
|
|
187
|
+
})) ??
|
|
188
|
+
resumeSessionId ??
|
|
189
|
+
null;
|
|
190
|
+
}
|
|
191
|
+
catch {
|
|
192
|
+
capturedSessionId = resumeSessionId ?? null;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
if (capturedSessionId) {
|
|
196
|
+
console.log(chalk.cyan(`\n đ Session ID: ${capturedSessionId}`));
|
|
197
|
+
console.log(chalk.gray(` Resume command: gemini --resume ${capturedSessionId}`));
|
|
198
|
+
}
|
|
199
|
+
else {
|
|
200
|
+
console.log(chalk.yellow("\n âšī¸ Could not determine Gemini session ID automatically."));
|
|
201
|
+
}
|
|
202
|
+
return capturedSessionId ? { sessionId: capturedSessionId } : {};
|
|
94
203
|
}
|
|
95
204
|
catch (error) {
|
|
96
205
|
const hasLocalGemini = await isGeminiCommandAvailable();
|
|
@@ -133,7 +242,12 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
|
|
|
133
242
|
async function isGeminiCommandAvailable() {
|
|
134
243
|
try {
|
|
135
244
|
const command = process.platform === "win32" ? "where" : "which";
|
|
136
|
-
await execa(command, ["gemini"], {
|
|
245
|
+
await execa(command, ["gemini"], {
|
|
246
|
+
shell: true,
|
|
247
|
+
stdin: "ignore",
|
|
248
|
+
stdout: "ignore",
|
|
249
|
+
stderr: "ignore",
|
|
250
|
+
});
|
|
137
251
|
return true;
|
|
138
252
|
}
|
|
139
253
|
catch {
|
package/dist/gemini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAwBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAwBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA0PlE;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC,CAkff;AAED,KAAK,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;AAC5D,KAAK,eAAe,GAAG,CAAC,SAAS,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAWrE,wBAAsB,kBAAkB,CACtC,SAAS,GAAE,SAAqB,EAChC,eAAe,GAAE,eAAsC,GACtD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CA6C1C"}
|