@tryglen/cli 0.41.1 → 0.41.3
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/_generated/contract/index.js +0 -1
- package/dist/_generated/contract/index.js.map +1 -1
- package/dist/_generated/contract/procedures.gen.js +0 -1
- package/dist/_generated/contract/procedures.gen.js.map +1 -1
- package/dist/_generated/contract/types.gen.js +0 -1
- package/dist/_generated/contract/types.gen.js.map +1 -1
- package/dist/_generated/contract/zod.gen.js +0 -91
- package/dist/_generated/contract/zod.gen.js.map +1 -1
- package/dist/bin.js +5 -13
- package/dist/bin.js.map +1 -1
- package/dist/clients/agents/agent-bin.js +0 -4
- package/dist/clients/agents/agent-bin.js.map +1 -1
- package/dist/clients/agents/agents-table.js +0 -2
- package/dist/clients/agents/agents-table.js.map +1 -1
- package/dist/clients/agents/idempotency-key.js +0 -4
- package/dist/clients/agents/idempotency-key.js.map +1 -1
- package/dist/clients/agents/plugin-status.js +0 -1
- package/dist/clients/agents/plugin-status.js.map +1 -1
- package/dist/clients/claude/injected-user-text-kind.js +0 -2
- package/dist/clients/claude/injected-user-text-kind.js.map +1 -1
- package/dist/clients/claude/parse-claude-transcript.js +0 -3
- package/dist/clients/claude/parse-claude-transcript.js.map +1 -1
- package/dist/clients/claude/turn-key.js +0 -3
- package/dist/clients/claude/turn-key.js.map +1 -1
- package/dist/clients/codex/codex-app-server.js +0 -3
- package/dist/clients/codex/codex-app-server.js.map +1 -1
- package/dist/clients/codex/codex-hooks-merge.js +0 -1
- package/dist/clients/codex/codex-hooks-merge.js.map +1 -1
- package/dist/clients/codex/codex-hooks-setup.js +0 -2
- package/dist/clients/codex/codex-hooks-setup.js.map +1 -1
- package/dist/clients/codex/codex-paths.js +0 -1
- package/dist/clients/codex/codex-paths.js.map +1 -1
- package/dist/clients/codex/codex-rules-setup.js +0 -1
- package/dist/clients/codex/codex-rules-setup.js.map +1 -1
- package/dist/clients/codex/codex-trust-toml.js +0 -1
- package/dist/clients/codex/codex-trust-toml.js.map +1 -1
- package/dist/clients/codex/parse-codex-transcript.js +0 -1
- package/dist/clients/codex/parse-codex-transcript.js.map +1 -1
- package/dist/clients/codex/turn-key.js +0 -1
- package/dist/clients/codex/turn-key.js.map +1 -1
- package/dist/clients/cursor/parse-cursor-db.js +0 -2
- package/dist/clients/cursor/parse-cursor-db.js.map +1 -1
- package/dist/clients/cursor/turn-key.js +0 -1
- package/dist/clients/cursor/turn-key.js.map +1 -1
- package/dist/clients/glen-api/from-wire.js +0 -3
- package/dist/clients/glen-api/from-wire.js.map +1 -1
- package/dist/clients/glen-api/glen-api.js +0 -3
- package/dist/clients/glen-api/glen-api.js.map +1 -1
- package/dist/clients/glen-api/glen-headers.js +0 -1
- package/dist/clients/glen-api/glen-headers.js.map +1 -1
- package/dist/clients/glen-api/refresh-control-state.js +0 -1
- package/dist/clients/glen-api/refresh-control-state.js.map +1 -1
- package/dist/clients/glen-api/report-cli-install.js +0 -1
- package/dist/clients/glen-api/report-cli-install.js.map +1 -1
- package/dist/clients/glen-api/sync-mode-from-server.js +0 -2
- package/dist/clients/glen-api/sync-mode-from-server.js.map +1 -1
- package/dist/clients/indicator/indicator-app.js +0 -5
- package/dist/clients/indicator/indicator-app.js.map +1 -1
- package/dist/clients/jcode/jcode-event.js +0 -1
- package/dist/clients/jcode/jcode-event.js.map +1 -1
- package/dist/clients/jcode/jcode-hook-lines.js +0 -1
- package/dist/clients/jcode/jcode-hook-lines.js.map +1 -1
- package/dist/clients/jcode/jcode-skills-sync.js +0 -1
- package/dist/clients/jcode/jcode-skills-sync.js.map +1 -1
- package/dist/clients/jcode/parse-jcode-session.js +0 -1
- package/dist/clients/jcode/parse-jcode-session.js.map +1 -1
- package/dist/clients/jcode/turn-key.js +0 -1
- package/dist/clients/jcode/turn-key.js.map +1 -1
- package/dist/clients/npm/update.js +0 -2
- package/dist/clients/npm/update.js.map +1 -1
- package/dist/clients/pi/parse-pi-transcript.js +0 -2
- package/dist/clients/pi/parse-pi-transcript.js.map +1 -1
- package/dist/clients/pi/pi-package-source.js +0 -3
- package/dist/clients/pi/pi-package-source.js.map +1 -1
- package/dist/clients/pi/turn-key.js +0 -1
- package/dist/clients/pi/turn-key.js.map +1 -1
- package/dist/commands/artifact/create.js +0 -2
- package/dist/commands/artifact/create.js.map +1 -1
- package/dist/commands/doctor/index.js +43 -47
- package/dist/commands/doctor/index.js.map +1 -1
- package/dist/commands/feedback/index.js +0 -1
- package/dist/commands/feedback/index.js.map +1 -1
- package/dist/commands/git-hooks/index.js +0 -1
- package/dist/commands/git-hooks/index.js.map +1 -1
- package/dist/commands/import/_utils/chunk-turns.js +0 -4
- package/dist/commands/import/_utils/chunk-turns.js.map +1 -1
- package/dist/commands/import/_utils/resolve-import-workspace.js +0 -1
- package/dist/commands/import/_utils/resolve-import-workspace.js.map +1 -1
- package/dist/commands/import/_utils/send-with-retry.js +0 -1
- package/dist/commands/import/_utils/send-with-retry.js.map +1 -1
- package/dist/commands/import/_utils/transcript-turns.js +0 -2
- package/dist/commands/import/_utils/transcript-turns.js.map +1 -1
- package/dist/commands/import/index.js +1 -8
- package/dist/commands/import/index.js.map +1 -1
- package/dist/commands/indicator/index.js +0 -1
- package/dist/commands/indicator/index.js.map +1 -1
- package/dist/commands/ingest/_utils/agent-adapter.js +4 -2
- package/dist/commands/ingest/_utils/agent-adapter.js.map +1 -1
- package/dist/commands/ingest/_utils/format-turn-nudges.js +0 -2
- package/dist/commands/ingest/_utils/format-turn-nudges.js.map +1 -1
- package/dist/commands/ingest/_utils/ingest-failure-memo.js +0 -1
- package/dist/commands/ingest/_utils/ingest-failure-memo.js.map +1 -1
- package/dist/commands/ingest/_utils/parse-transcript.js +0 -4
- package/dist/commands/ingest/_utils/parse-transcript.js.map +1 -1
- package/dist/commands/ingest/_utils/turn-cache.js +0 -1
- package/dist/commands/ingest/_utils/turn-cache.js.map +1 -1
- package/dist/commands/ingest/index.js +24 -33
- package/dist/commands/ingest/index.js.map +1 -1
- package/dist/commands/install/_utils/codex-post-install.js +0 -2
- package/dist/commands/install/_utils/codex-post-install.js.map +1 -1
- package/dist/commands/install/_utils/ensure-global-cli.js +0 -4
- package/dist/commands/install/_utils/ensure-global-cli.js.map +1 -1
- package/dist/commands/install/_utils/finish-install.js +0 -1
- package/dist/commands/install/_utils/finish-install.js.map +1 -1
- package/dist/commands/install/_utils/npm-error-cause.js +0 -1
- package/dist/commands/install/_utils/npm-error-cause.js.map +1 -1
- package/dist/commands/install/_utils/prepare-machine.js +6 -3
- package/dist/commands/install/_utils/prepare-machine.js.map +1 -1
- package/dist/commands/install/index.js +1 -6
- package/dist/commands/install/index.js.map +1 -1
- package/dist/commands/login/_utils/open-browser.js +0 -1
- package/dist/commands/login/_utils/open-browser.js.map +1 -1
- package/dist/commands/onboard/index.js +0 -1
- package/dist/commands/onboard/index.js.map +1 -1
- package/dist/commands/org/_utils/apply-switch.js +0 -1
- package/dist/commands/org/_utils/apply-switch.js.map +1 -1
- package/dist/commands/org/_utils/fetch-orgs.js +0 -1
- package/dist/commands/org/_utils/fetch-orgs.js.map +1 -1
- package/dist/commands/pr-link/_utils/is-commit-command.js +0 -1
- package/dist/commands/pr-link/_utils/is-commit-command.js.map +1 -1
- package/dist/commands/pr-link/index.js +2 -5
- package/dist/commands/pr-link/index.js.map +1 -1
- package/dist/commands/search/_utils/format-search-result.js +0 -3
- package/dist/commands/search/_utils/format-search-result.js.map +1 -1
- package/dist/commands/search/_utils/runtime-timezone.js +0 -1
- package/dist/commands/search/_utils/runtime-timezone.js.map +1 -1
- package/dist/commands/session-start/index.js +5 -8
- package/dist/commands/session-start/index.js.map +1 -1
- package/dist/commands/set-mode/index.js +0 -1
- package/dist/commands/set-mode/index.js.map +1 -1
- package/dist/commands/skill/_utils/skill-cache.js +0 -3
- package/dist/commands/skill/_utils/skill-cache.js.map +1 -1
- package/dist/commands/skill/create/_utils/pack-skill-dir.js +0 -2
- package/dist/commands/skill/create/_utils/pack-skill-dir.js.map +1 -1
- package/dist/commands/skill/create/index.js +0 -2
- package/dist/commands/skill/create/index.js.map +1 -1
- package/dist/commands/skill/use.js +0 -2
- package/dist/commands/skill/use.js.map +1 -1
- package/dist/commands/statusline/index.js +0 -2
- package/dist/commands/statusline/index.js.map +1 -1
- package/dist/commands/takeover/_utils/agent-paths.js +0 -3
- package/dist/commands/takeover/_utils/agent-paths.js.map +1 -1
- package/dist/commands/takeover/_utils/agent-process.js +0 -1
- package/dist/commands/takeover/_utils/agent-process.js.map +1 -1
- package/dist/commands/takeover/_utils/codex-desktop-recovery.js +0 -1
- package/dist/commands/takeover/_utils/codex-desktop-recovery.js.map +1 -1
- package/dist/commands/takeover/_utils/codex-thread-messages.js +0 -1
- package/dist/commands/takeover/_utils/codex-thread-messages.js.map +1 -1
- package/dist/commands/takeover/_utils/context-fit.js +0 -1
- package/dist/commands/takeover/_utils/context-fit.js.map +1 -1
- package/dist/commands/takeover/_utils/cursor-store.js +0 -3
- package/dist/commands/takeover/_utils/cursor-store.js.map +1 -1
- package/dist/commands/takeover/_utils/native-file.js +0 -1
- package/dist/commands/takeover/_utils/native-file.js.map +1 -1
- package/dist/commands/takeover/_utils/verify-codex-session.js +0 -1
- package/dist/commands/takeover/_utils/verify-codex-session.js.map +1 -1
- package/dist/commands/takeover/_utils/write-codex-desktop-session.js +0 -1
- package/dist/commands/takeover/_utils/write-codex-desktop-session.js.map +1 -1
- package/dist/commands/takeover/_utils/write-codex-session.js +0 -4
- package/dist/commands/takeover/_utils/write-codex-session.js.map +1 -1
- package/dist/commands/takeover/index.js +0 -2
- package/dist/commands/takeover/index.js.map +1 -1
- package/dist/commands/takeover/takeover.schema.js +0 -1
- package/dist/commands/takeover/takeover.schema.js.map +1 -1
- package/dist/commands/uninstall/_utils/purge-local-state.js +0 -1
- package/dist/commands/uninstall/_utils/purge-local-state.js.map +1 -1
- package/dist/commands/uninstall/index.js +0 -3
- package/dist/commands/uninstall/index.js.map +1 -1
- package/dist/commands/update/index.js +0 -3
- package/dist/commands/update/index.js.map +1 -1
- package/dist/core/errors/cli-error.js +0 -1
- package/dist/core/errors/cli-error.js.map +1 -1
- package/dist/core/json/jsonl-records.js +0 -1
- package/dist/core/json/jsonl-records.js.map +1 -1
- package/dist/core/json/text-field.js +0 -1
- package/dist/core/json/text-field.js.map +1 -1
- package/dist/core/run/agent-bins.js +3 -0
- package/dist/core/run/agent-bins.js.map +1 -0
- package/dist/core/run/cli-input.js +0 -7
- package/dist/core/run/cli-input.js.map +1 -1
- package/dist/core/run/hook-agents.js +0 -1
- package/dist/core/run/hook-agents.js.map +1 -1
- package/dist/core/run/hook-profile.js +45 -0
- package/dist/core/run/hook-profile.js.map +1 -0
- package/dist/core/run/normalize-boolean-flags.js +0 -1
- package/dist/core/run/normalize-boolean-flags.js.map +1 -1
- package/dist/core/run/run-hook.js +0 -1
- package/dist/core/run/run-hook.js.map +1 -1
- package/dist/core/state/ephemeral-session.js +3 -2
- package/dist/core/state/ephemeral-session.js.map +1 -1
- package/dist/core/state/import-job.js +0 -2
- package/dist/core/state/import-job.js.map +1 -1
- package/dist/core/state/install-receipt.js +2 -4
- package/dist/core/state/install-receipt.js.map +1 -1
- package/dist/core/system/files.js +0 -1
- package/dist/core/system/files.js.map +1 -1
- package/dist/core/system/http.js +0 -2
- package/dist/core/system/http.js.map +1 -1
- package/dist/core/system/shell-profile.js +0 -4
- package/dist/core/system/shell-profile.js.map +1 -1
- package/dist/core/system/spawn-detached.js +0 -1
- package/dist/core/system/spawn-detached.js.map +1 -1
- package/dist/core/system/spawn-self.js +0 -1
- package/dist/core/system/spawn-self.js.map +1 -1
- package/dist/core/system/sqlite.js +0 -1
- package/dist/core/system/sqlite.js.map +1 -1
- package/dist/core/system/version.js +0 -2
- package/dist/core/system/version.js.map +1 -1
- package/dist/core/telemetry/build-event.js +0 -1
- package/dist/core/telemetry/build-event.js.map +1 -1
- package/dist/core/telemetry/events-store.js +0 -1
- package/dist/core/telemetry/events-store.js.map +1 -1
- package/dist/core/telemetry/finish-telemetry.js +0 -1
- package/dist/core/telemetry/finish-telemetry.js.map +1 -1
- package/dist/core/telemetry/note-if-err.js +0 -1
- package/dist/core/telemetry/note-if-err.js.map +1 -1
- package/dist/core/telemetry/telemetry-context.js +0 -1
- package/dist/core/telemetry/telemetry-context.js.map +1 -1
- package/dist/core/terminal/out.js +0 -1
- package/dist/core/terminal/out.js.map +1 -1
- package/dist/core/terminal/prompt.js +0 -2
- package/dist/core/terminal/prompt.js.map +1 -1
- package/dist/core/terminal/read-hook-event.js +0 -1
- package/dist/core/terminal/read-hook-event.js.map +1 -1
- package/dist/jcode/plugin.json +1 -1
- package/dist/jcode/skills/code-search/SKILL.md +1 -1
- package/package.json +3 -2
|
@@ -38,7 +38,6 @@ const writeMemo = async (memo) => {
|
|
|
38
38
|
remedy: "check ownership of ~/.glen (e.g. `sudo chown -R $USER ~/.glen`)",
|
|
39
39
|
}));
|
|
40
40
|
};
|
|
41
|
-
// ok(true) means "tell the user": only on the second failure in a row.
|
|
42
41
|
const recordIngestCaptureOutcome = async (sessionId, outcome) => {
|
|
43
42
|
const memo = await readMemo();
|
|
44
43
|
if (outcome === "success") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest-failure-memo.js","sourceRoot":"","sources":["../../../../src/commands/ingest/_utils/ingest-failure-memo.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ingest-failure-memo.js","sourceRoot":"","sources":["../../../../src/commands/ingest/_utils/ingest-failure-memo.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { claudeTurnKey } from "../../../clients/claude/turn-key.js";
|
|
|
3
3
|
import { injectedUserTextKind } from "../../../clients/claude/injected-user-text-kind.js";
|
|
4
4
|
import { field } from "../../../core/json/json-field.js";
|
|
5
5
|
import { parseJson } from "../../../core/json/parse-json.js";
|
|
6
|
-
// The server rejects segment text over this length, which would drop the whole turn.
|
|
7
6
|
const MAX_SEGMENT_CHARS = 30_000;
|
|
8
7
|
const extractText = (content) => {
|
|
9
8
|
if (typeof content === "string")
|
|
@@ -40,7 +39,6 @@ const lastIndexWhere = (messages, match) => {
|
|
|
40
39
|
const reversedIndex = [...messages].reverse().findIndex(match);
|
|
41
40
|
return reversedIndex < 0 ? -1 : messages.length - 1 - reversedIndex;
|
|
42
41
|
};
|
|
43
|
-
// Claude writes each content block as its own line: the newest assistant line may be thinking or tool_use.
|
|
44
42
|
const isAssistantReply = (e) => roleOf(e) === "assistant" && contentOf(e) !== "";
|
|
45
43
|
const completedTurnOf = (messages) => {
|
|
46
44
|
const assistantIndex = lastIndexWhere(messages, isAssistantReply);
|
|
@@ -53,11 +51,9 @@ const completedTurnOf = (messages) => {
|
|
|
53
51
|
const userMessage = messages[userIndex];
|
|
54
52
|
const assistantMessage = messages[assistantIndex];
|
|
55
53
|
const userText = contentOf(userMessage);
|
|
56
|
-
// The harness wrote this line, so the turn has no prompt; a notification rides on the reply.
|
|
57
54
|
const injected = field(userMessage, "isMeta") === true
|
|
58
55
|
? "harness"
|
|
59
56
|
: injectedUserTextKind(userText);
|
|
60
|
-
// Counts user lines of any type: it feeds the idempotency key, which would otherwise collide.
|
|
61
57
|
const originalUserIndex = lastIndexWhere(priorMessages, (e) => roleOf(e) === "user");
|
|
62
58
|
return {
|
|
63
59
|
user: injected ? null : userText,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-transcript.js","sourceRoot":"","sources":["../../../../src/commands/ingest/_utils/parse-transcript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-transcript.js","sourceRoot":"","sources":["../../../../src/commands/ingest/_utils/parse-transcript.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,7 +67,6 @@ const read = async (conversationId) => {
|
|
|
67
67
|
const e = (await readCache())[conversationId];
|
|
68
68
|
return { prompt: e?.prompt ?? null, assistant: e?.assistant ?? null };
|
|
69
69
|
};
|
|
70
|
-
// Cursor's hooks send the prompt and the reply in separate events: this pairs them per conversation.
|
|
71
70
|
const turnCache = { read, rememberPrompt, rememberAssistant };
|
|
72
71
|
export { turnCache };
|
|
73
72
|
//# sourceMappingURL=turn-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-cache.js","sourceRoot":"","sources":["../../../../src/commands/ingest/_utils/turn-cache.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"turn-cache.js","sourceRoot":"","sources":["../../../../src/commands/ingest/_utils/turn-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { field } from "../../core/json/json-field.js";
|
|
|
10
10
|
import { out } from "../../core/terminal/out.js";
|
|
11
11
|
import { prReviewLink } from "../../clients/git/pr-review-link.js";
|
|
12
12
|
import { readHookEvent } from "../../core/terminal/read-hook-event.js";
|
|
13
|
+
import { hookProfile } from "../../core/run/hook-profile.js";
|
|
13
14
|
import { refreshControlState } from "../../clients/glen-api/refresh-control-state.js";
|
|
14
15
|
import { err, ok } from "../../core/errors/result.js";
|
|
15
16
|
import { sessionMap } from "../../core/state/session-map.js";
|
|
@@ -32,7 +33,7 @@ import { idempotencyKey } from "../../clients/agents/idempotency-key.js";
|
|
|
32
33
|
import { textField } from "../../core/json/text-field.js";
|
|
33
34
|
const INGEST_TIMEOUT_MS = 8000;
|
|
34
35
|
const str = (v) => (typeof v === "string" ? v : null);
|
|
35
|
-
const readEvent = async (agent) => agent === "jcode"
|
|
36
|
+
const readEvent = async (agent) => hookProfile(agent).eventSource === "jcode"
|
|
36
37
|
? ok(await jcodeEvent.readStop())
|
|
37
38
|
: readHookEvent((cause) => cliErr("Parse", {
|
|
38
39
|
code: "ingest.invalid_event",
|
|
@@ -40,7 +41,6 @@ const readEvent = async (agent) => agent === "jcode"
|
|
|
40
41
|
cause,
|
|
41
42
|
remedy: "update glen and the agent's glen plugin (`glen update`)",
|
|
42
43
|
}));
|
|
43
|
-
// Cursor names the session `conversation_id` and its Stop event `afterAgentResponse`.
|
|
44
44
|
const normalizeCursor = (event) => {
|
|
45
45
|
const conversationId = field(event, "conversation_id");
|
|
46
46
|
return {
|
|
@@ -84,13 +84,12 @@ const stopReviewHintFor = (assistantText) => {
|
|
|
84
84
|
.join("\n");
|
|
85
85
|
return `${links}\nSurface the Glen review link alongside the GitHub PR link.`;
|
|
86
86
|
};
|
|
87
|
-
|
|
88
|
-
const
|
|
89
|
-
const silent = agentName === "cursor" || agentName === "jcode";
|
|
87
|
+
const makeEmitters = (context, hookEventName, stopReviewHint) => {
|
|
88
|
+
const silent = context === "none";
|
|
90
89
|
const emit = (text) => {
|
|
91
90
|
if (silent)
|
|
92
91
|
return;
|
|
93
|
-
if (
|
|
92
|
+
if (context === "text") {
|
|
94
93
|
out.hookText(text);
|
|
95
94
|
return;
|
|
96
95
|
}
|
|
@@ -98,7 +97,6 @@ const makeEmitters = (agentName, hookEventName, stopReviewHint) => {
|
|
|
98
97
|
hookSpecificOutput: { hookEventName, additionalContext: text },
|
|
99
98
|
});
|
|
100
99
|
};
|
|
101
|
-
// At most one JSON object per Stop turn: codex drops all context when stdout has several.
|
|
102
100
|
const emitStop = (hint) => {
|
|
103
101
|
if (silent)
|
|
104
102
|
return;
|
|
@@ -112,7 +110,6 @@ const makeEmitters = (agentName, hookEventName, stopReviewHint) => {
|
|
|
112
110
|
},
|
|
113
111
|
});
|
|
114
112
|
};
|
|
115
|
-
// Stop hints go to stderr: Claude re-wakes the agent on Stop context, so it would loop forever.
|
|
116
113
|
const emitHint = (text) => {
|
|
117
114
|
if (hookEventName === "Stop") {
|
|
118
115
|
out.hookNotice(text.replace(/^\[glen\] /, ""));
|
|
@@ -133,7 +130,6 @@ const additionalContextOf = (agentName, cwd, sessionFields) => {
|
|
|
133
130
|
: {}),
|
|
134
131
|
};
|
|
135
132
|
};
|
|
136
|
-
// No --agent means Claude Code, the original plugin.
|
|
137
133
|
const agentOf = (agentName) => agentName ?? "claude-code";
|
|
138
134
|
const stopBody = (b) => {
|
|
139
135
|
const text = textField(b.event, "text");
|
|
@@ -149,7 +145,7 @@ const stopBody = (b) => {
|
|
|
149
145
|
additionalContext: b.additionalContext,
|
|
150
146
|
hookEvent: "Stop",
|
|
151
147
|
};
|
|
152
|
-
if (b.
|
|
148
|
+
if (b.turn === "last-reply")
|
|
153
149
|
return b.adapted.priorAssistant
|
|
154
150
|
? buildTurnBody({
|
|
155
151
|
...base,
|
|
@@ -157,18 +153,18 @@ const stopBody = (b) => {
|
|
|
157
153
|
messages: [{ role: "assistant", content: b.adapted.priorAssistant }],
|
|
158
154
|
})
|
|
159
155
|
: null;
|
|
160
|
-
if (b.
|
|
161
|
-
return b.
|
|
156
|
+
if (b.turn === "turn-cache")
|
|
157
|
+
return b.cachedTurn.prompt && text
|
|
162
158
|
? buildTurnBody({
|
|
163
159
|
...base,
|
|
164
160
|
idempotencyKey: stopKey(),
|
|
165
161
|
messages: [
|
|
166
|
-
{ role: "user", content: b.
|
|
162
|
+
{ role: "user", content: b.cachedTurn.prompt },
|
|
167
163
|
{ role: "assistant", content: text },
|
|
168
164
|
],
|
|
169
165
|
})
|
|
170
166
|
: null;
|
|
171
|
-
if (b.
|
|
167
|
+
if (b.turn === "event") {
|
|
172
168
|
const prompt = textField(b.event, "prompt");
|
|
173
169
|
return prompt && text
|
|
174
170
|
? buildTurnBody({
|
|
@@ -183,7 +179,6 @@ const stopBody = (b) => {
|
|
|
183
179
|
}
|
|
184
180
|
const turn = b.transcript.completedTurn;
|
|
185
181
|
const lastReply = textField(b.event, "last_assistant_message");
|
|
186
|
-
// Claude runs Stop before it writes the turn to the transcript; its input carries the reply.
|
|
187
182
|
if (lastReply && turn?.assistant !== lastReply)
|
|
188
183
|
return buildTurnBody({
|
|
189
184
|
...base,
|
|
@@ -220,18 +215,18 @@ const stopBody = (b) => {
|
|
|
220
215
|
const promptBody = (b, prompt) => buildTurnBody({
|
|
221
216
|
sessionId: b.sessionId,
|
|
222
217
|
prompt,
|
|
223
|
-
priorAssistant: b.adapted.priorAssistant ?? b.
|
|
218
|
+
priorAssistant: b.adapted.priorAssistant ?? b.cachedTurn.assistant ?? null,
|
|
224
219
|
idempotencyKey: idempotencyKey.forPrompt(agentOf(b.agentName), b.sessionId, {
|
|
225
220
|
event: b.event,
|
|
226
221
|
userLineCount: b.transcript.nextUserMessageIndex,
|
|
227
222
|
}),
|
|
228
223
|
additionalContext: b.additionalContext,
|
|
229
224
|
});
|
|
230
|
-
const assistantTextFor = (
|
|
225
|
+
const assistantTextFor = (turn, event, transcript, cachedTurn) => turn === "last-reply"
|
|
231
226
|
? (str(field(event, "last_assistant_message")) ?? "")
|
|
232
|
-
:
|
|
233
|
-
? (
|
|
234
|
-
:
|
|
227
|
+
: turn === "turn-cache"
|
|
228
|
+
? (cachedTurn.assistant ?? "")
|
|
229
|
+
: turn === "event"
|
|
235
230
|
? (str(field(event, "text")) ?? "")
|
|
236
231
|
: (textField(event, "last_assistant_message") ??
|
|
237
232
|
transcript.completedTurn?.assistant ??
|
|
@@ -258,12 +253,10 @@ const handleTurnFailure = async (e, ctx) => {
|
|
|
258
253
|
ctx.emitters.emitHint("[glen] no active organization: run `glen org switch`");
|
|
259
254
|
return err(e);
|
|
260
255
|
}
|
|
261
|
-
// Don't clear credentials here: a concurrent `glen login` may have just saved a fresh key.
|
|
262
256
|
ctx.emitters.emitHint(`[glen] ACTION NEEDED: this machine's glen connection expired or was revoked, so memories are NOT being captured. Tell the user to run \`glen login\` to reconnect.${updateAddendum()}`);
|
|
263
257
|
return err(e);
|
|
264
258
|
}
|
|
265
259
|
if (e.code === "api.unexpected_response") {
|
|
266
|
-
// The server stored the turn; only its reply didn't match this CLI's contract.
|
|
267
260
|
noteIfErr(await recordIngestCaptureOutcome(ctx.sessionId, "success"));
|
|
268
261
|
noteIfErr(await ingestHeartbeat.recordOutcome(ctx.heartbeatAgent, "success"));
|
|
269
262
|
ctx.emitters.emitStop("");
|
|
@@ -284,6 +277,7 @@ const ingest = ingestOptions.handle(async ({ agent: agentName }) => {
|
|
|
284
277
|
if (!read.value)
|
|
285
278
|
return ok(undefined);
|
|
286
279
|
const event = agentName === "cursor" ? normalizeCursor(read.value) : read.value;
|
|
280
|
+
const profile = hookProfile(agentName);
|
|
287
281
|
const hookEventName = str(field(event, "hook_event_name")) ?? "UserPromptSubmit";
|
|
288
282
|
const sessionId = textField(event, "session_id");
|
|
289
283
|
if (!sessionId)
|
|
@@ -291,14 +285,12 @@ const ingest = ingestOptions.handle(async ({ agent: agentName }) => {
|
|
|
291
285
|
const prompt = str(field(event, "prompt"));
|
|
292
286
|
if (hookEventName !== "Stop" && prompt === null)
|
|
293
287
|
return ok(undefined);
|
|
294
|
-
// Ephemeral session: stdout would leak into the parent orchestrator.
|
|
295
288
|
if (isEphemeralSession(agentName, event))
|
|
296
289
|
return ok(undefined);
|
|
297
290
|
const heartbeatAgent = agentName ?? "unknown";
|
|
298
|
-
// Before the credentials check: a logged-out machine still needs to prove the hook fired.
|
|
299
291
|
noteIfErr(await ingestHeartbeat.recordRun(heartbeatAgent));
|
|
300
292
|
if (!(await credentials.read())) {
|
|
301
|
-
makeEmitters(
|
|
293
|
+
makeEmitters(profile.ingestContext, hookEventName, "").emit("[glen] not connected: run `glen login`");
|
|
302
294
|
return ok(undefined);
|
|
303
295
|
}
|
|
304
296
|
const localState = await glenState.read();
|
|
@@ -310,15 +302,15 @@ const ingest = ingestOptions.handle(async ({ agent: agentName }) => {
|
|
|
310
302
|
const transcriptLines = await readTranscriptLines(str(field(event, "transcript_path")));
|
|
311
303
|
const transcript = parseTranscript(transcriptLines);
|
|
312
304
|
const stopText = textField(event, "text");
|
|
313
|
-
if (
|
|
305
|
+
if (profile.turn === "turn-cache" && hookEventName === "Stop" && stopText)
|
|
314
306
|
noteIfErr(await turnCache.rememberAssistant(sessionId, stopText));
|
|
315
|
-
const
|
|
307
|
+
const cachedTurn = profile.turn === "turn-cache"
|
|
316
308
|
? await turnCache.read(sessionId)
|
|
317
309
|
: { prompt: null, assistant: null };
|
|
318
310
|
const stopReviewHint = hookEventName === "Stop"
|
|
319
|
-
? stopReviewHintFor(assistantTextFor(
|
|
311
|
+
? stopReviewHintFor(assistantTextFor(profile.turn, event, transcript, cachedTurn))
|
|
320
312
|
: "";
|
|
321
|
-
const emitters = makeEmitters(
|
|
313
|
+
const emitters = makeEmitters(profile.ingestContext, hookEventName, stopReviewHint);
|
|
322
314
|
const eventCwd = cwdOf(event);
|
|
323
315
|
const recorded = await sessionMap.record(eventCwd, sessionId);
|
|
324
316
|
if (!recorded.ok)
|
|
@@ -330,19 +322,19 @@ const ingest = ingestOptions.handle(async ({ agent: agentName }) => {
|
|
|
330
322
|
const adapted = adaptAgentEvent(agentName, event, transcriptLines);
|
|
331
323
|
const bodyInput = {
|
|
332
324
|
agentName,
|
|
325
|
+
turn: profile.turn,
|
|
333
326
|
hookEventName,
|
|
334
327
|
event,
|
|
335
328
|
sessionId,
|
|
336
329
|
transcript,
|
|
337
330
|
adapted,
|
|
338
|
-
|
|
331
|
+
cachedTurn,
|
|
339
332
|
additionalContext: additionalContextOf(agentName, eventCwd, adapted.sessionFields),
|
|
340
333
|
};
|
|
341
334
|
const body = hookEventName === "Stop"
|
|
342
335
|
? stopBody(bodyInput)
|
|
343
336
|
: promptBody(bodyInput, prompt ?? "");
|
|
344
|
-
|
|
345
|
-
if (agentName === "cursor" && hookEventName !== "Stop")
|
|
337
|
+
if (profile.turn === "turn-cache" && hookEventName !== "Stop")
|
|
346
338
|
noteIfErr(await turnCache.rememberPrompt(sessionId, prompt ?? ""));
|
|
347
339
|
if (!body) {
|
|
348
340
|
if (hookEventName === "Stop")
|
|
@@ -362,7 +354,6 @@ const ingest = ingestOptions.handle(async ({ agent: agentName }) => {
|
|
|
362
354
|
noteIfErr(await recordIngestCaptureOutcome(sessionId, "success"));
|
|
363
355
|
noteIfErr(await ingestHeartbeat.recordOutcome(heartbeatAgent, "success"));
|
|
364
356
|
const effectiveState = (await syncModeFromServer(turn.value)) ?? state;
|
|
365
|
-
// Only on change: Codex shows every injection as a visible card.
|
|
366
357
|
const stateLine = formatStateLine(effectiveState);
|
|
367
358
|
const remembered = stateLine !== null && hookEventName !== "Stop"
|
|
368
359
|
? await rememberStateLine(sessionId, stateLine)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/ingest/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/ingest/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const warned = (e) => {
|
|
|
8
8
|
return [e];
|
|
9
9
|
};
|
|
10
10
|
const TRUST_REMEDY = "open Codex, run /hooks, and trust the glen hooks (Codex skips untrusted hooks silently)";
|
|
11
|
-
// Re-verify against a fresh hooks/list: a stale trust marker can lie.
|
|
12
11
|
const verifyTrust = async () => {
|
|
13
12
|
const verify = await listCodexHooks(process.cwd());
|
|
14
13
|
const glenHooks = verify.ok
|
|
@@ -30,7 +29,6 @@ const verifyTrust = async () => {
|
|
|
30
29
|
out.success("hooks verified trusted (they run on THIS machine when a codex session runs here)", { indent: 1 });
|
|
31
30
|
return [];
|
|
32
31
|
};
|
|
33
|
-
// Codex never fires plugin-manifest hooks (openai/codex#16430); `glen install` is the trust consent.
|
|
34
32
|
const codexPostInstall = async () => {
|
|
35
33
|
out.step("Registering glen hooks in Codex's user config (plugin hooks don't fire: openai/codex#16430)", { indent: 1 });
|
|
36
34
|
const r = await codexHooks.install();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-post-install.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/codex-post-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AAEpD,MAAM,MAAM,GAAG,CAAC,CAAW,EAAc,EAAE;IACzC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3B,OAAO,CAAC,CAAC,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,YAAY,GAChB,yFAAyF,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-post-install.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/codex-post-install.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ import { cliVersion } from "../../../core/system/version.js";
|
|
|
11
11
|
import { agentBin } from "../../../clients/agents/agent-bin.js";
|
|
12
12
|
import { npmErrorCause } from "./npm-error-cause.js";
|
|
13
13
|
const PERMISSIONS_DOC = "https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally";
|
|
14
|
-
// npx runs this CLI from a shim that vanishes on exit; counting it as a real global would skip the install a fresh machine needs.
|
|
15
14
|
const isEphemeralRunnerPath = (candidate) => {
|
|
16
15
|
if (candidate.includes("/_npx/"))
|
|
17
16
|
return true;
|
|
@@ -43,7 +42,6 @@ const targetAt = (npmPath, prefix, fallback) => ({
|
|
|
43
42
|
glenPath: join(prefix, "bin", "glen"),
|
|
44
43
|
fallback,
|
|
45
44
|
});
|
|
46
|
-
// The user's own npm prefix (~/.npmrc, the npm docs' EACCES fix) wins when its bin is on PATH.
|
|
47
45
|
const configuredPrefix = (npmPath) => {
|
|
48
46
|
const r = runProgram(npmPath, ["prefix", "-g"], { timeoutMs: 10_000 });
|
|
49
47
|
if (!r.ok)
|
|
@@ -51,7 +49,6 @@ const configuredPrefix = (npmPath) => {
|
|
|
51
49
|
const prefix = r.value.stdout.trim();
|
|
52
50
|
return isAbsolute(prefix) && onPath(join(prefix, "bin")) ? prefix : null;
|
|
53
51
|
};
|
|
54
|
-
// Otherwise the folder beside the npm shim on PATH, not its realpath: Vite+ resolves it into a private runtime.
|
|
55
52
|
const npmGlobalTarget = () => {
|
|
56
53
|
const found = runProgram("which", ["npm"], { timeoutMs: 10_000 });
|
|
57
54
|
if (!found.ok)
|
|
@@ -93,7 +90,6 @@ const installFailedFrom = (target, hadExisting, failure) => installFailed(hadExi
|
|
|
93
90
|
path: npmErrorCause(failure.stderr).logPath,
|
|
94
91
|
permission: isPermissionFailure(failure),
|
|
95
92
|
});
|
|
96
|
-
// A root-owned global folder (system Node, /usr/local) falls back to ~/.glen, which uninstall removes whole.
|
|
97
93
|
const installGlobally = (target, hadExisting) => {
|
|
98
94
|
const installed = runInstall(target);
|
|
99
95
|
if (installed.ok)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-global-cli.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/ensure-global-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,eAAe,GACnB,8FAA8F,CAAC;
|
|
1
|
+
{"version":3,"file":"ensure-global-cli.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/ensure-global-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,6 @@ const connect = async (askToConnect, browser) => {
|
|
|
44
44
|
};
|
|
45
45
|
const recordOutcome = async (install) => {
|
|
46
46
|
const now = new Date().toISOString();
|
|
47
|
-
// Recorded before the pending outbox, which reportCliInstall clears below.
|
|
48
47
|
const recorded = [
|
|
49
48
|
await installReceipt.recordInstalledAt(now),
|
|
50
49
|
await installReceipt.recordPendingInstall({ ...install, occurredAt: now }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finish-install.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/finish-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAI7C,MAAM,cAAc,GAAG,KAAK,IAAyB,EAAE;IACrD,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAC;QAClE,OAAO,EAAE,CAAC;IACZ,MAAM,CAAC,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,CAAC;IAC7C,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,OAAO,CACT,mEAAmE,CACpE,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;QACZ,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE;YACjB,IAAI,EAAE,+BAA+B;YACrC,IAAI,EAAE,wCAAwC;YAC9C,MAAM,EAAE,+BAA+B;SACxC,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACZ,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,OAAO,CAAC,CAAC,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,KAAK,EACnB,YAAqB,EACrB,OAAgB,EACK,EAAE;IACvB,IAAI,MAAM,WAAW,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,YAAY;QACzB,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,gCAAgC,EAAE,IAAI,CAAC;QAC9D,CAAC,CAAC,IAAI,CAAC;IACT,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,IAAI,CACN,MAAM,KAAK,KAAK;YACd,CAAC,CAAC,oCAAoC;YACtC,CAAC,CAAC,0CAA0C,CAC/C,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC;IACpB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAClB,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EACzB,OAA2C,EACtB,EAAE;IACvB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"finish-install.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/finish-install.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const NPM_PREFIX = /^npm (?:error|ERR!)\s?/;
|
|
2
2
|
const LOG_LINE = /^A complete log of this run can be found in:\s*(.+)$/;
|
|
3
|
-
// npm ends every failure with permissions/log boilerplate; the real cause is its `Error:` or `code` line.
|
|
4
3
|
const npmErrorCause = (stderr) => {
|
|
5
4
|
const lines = stderr
|
|
6
5
|
.split("\n")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-error-cause.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/npm-error-cause.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,QAAQ,GAAG,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"npm-error-cause.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/npm-error-cause.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,QAAQ,GAAG,sDAAsD,CAAC;AAGxE,MAAM,aAAa,GAAG,CACpB,MAAc,EACoC,EAAE;IACpD,MAAM,KAAK,GAAG,MAAM;SACjB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;SAClD,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,MAAM,SAAS,GACb,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9E,MAAM,OAAO,GACX,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACtE,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,SAAS,EAAE,OAAO,EAAE,CAAC;AACpD,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { agentPathOverrides } from "../../../clients/agents/agent-path-overrides.js";
|
|
2
|
+
import { agentsTable } from "../../../clients/agents/agents-table.js";
|
|
2
3
|
import { cliErr } from "../../../core/errors/cli-error.js";
|
|
3
4
|
import { credentials } from "../../../core/state/credentials.js";
|
|
4
5
|
import { files } from "../../../core/system/files.js";
|
|
@@ -8,10 +9,13 @@ import { prompt } from "../../../core/terminal/prompt.js";
|
|
|
8
9
|
import { err, ok } from "../../../core/errors/result.js";
|
|
9
10
|
import { shellProfile } from "../../../core/system/shell-profile.js";
|
|
10
11
|
import { glenState } from "../../../core/state/state.js";
|
|
12
|
+
import { installOptions } from "../install.options.js";
|
|
11
13
|
import { ensureGlobalCli } from "./ensure-global-cli.js";
|
|
14
|
+
const isPathKey = (key) => key in (installOptions.install.flags ?? {});
|
|
12
15
|
const applyPathOverrides = async (paths) => {
|
|
13
|
-
for (const bin of
|
|
14
|
-
const
|
|
16
|
+
for (const { bin } of agentsTable.agents) {
|
|
17
|
+
const key = `${bin}Path`;
|
|
18
|
+
const path = isPathKey(key) ? paths[key] : undefined;
|
|
15
19
|
if (path === undefined)
|
|
16
20
|
continue;
|
|
17
21
|
if (!files.isExecutableSync(path))
|
|
@@ -65,7 +69,6 @@ const notOnPath = (binDir, profilePath) => cliErr("Exec", {
|
|
|
65
69
|
what: `the glen command is installed in ${binDir}, which isn't on PATH, so the plugins can't run it`,
|
|
66
70
|
remedy: `add \`export PATH="${binDir}:$PATH"\` to ${profilePath ?? "your shell profile"}, then open a new terminal`,
|
|
67
71
|
});
|
|
68
|
-
// Agent hooks run `$SHELL -lc`, so the login profile is what makes `glen` resolve for them.
|
|
69
72
|
const addToPath = async (binDir) => {
|
|
70
73
|
const profile = shellProfile.loginProfile();
|
|
71
74
|
out.info(`npm's global folder isn't writable, so glen went into ${binDir}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-machine.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/prepare-machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"prepare-machine.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/prepare-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,12 +100,7 @@ const install = installOptions.install.handle(async (opts) => {
|
|
|
100
100
|
out.heading("🏔️ glen: install agent plugins");
|
|
101
101
|
const askToConnect = opts.agent === undefined;
|
|
102
102
|
const finishOpts = { askToConnect, browser: opts.browser };
|
|
103
|
-
const prepared = await prepareMachine(
|
|
104
|
-
codex: opts.codexPath,
|
|
105
|
-
claude: opts.claudePath,
|
|
106
|
-
pi: opts.piPath,
|
|
107
|
-
jcode: opts.jcodePath,
|
|
108
|
-
});
|
|
103
|
+
const prepared = await prepareMachine(opts);
|
|
109
104
|
if (!prepared.ok)
|
|
110
105
|
return prepared;
|
|
111
106
|
const warnings = [...prepared.value];
|