typeclaw 0.42.0 → 0.42.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/package.json +3 -3
- package/src/agent/adaptive-thinking-compat.ts +79 -0
- package/src/agent/index.ts +79 -101
- package/src/agent/plugin-tools.ts +77 -130
- package/src/agent/provider-error.ts +37 -0
- package/src/agent/reload-tool.ts +1 -1
- package/src/agent/subagents.ts +2 -2
- package/src/agent/system-prompt.ts +19 -5
- package/src/agent/tool-result-budget.ts +1 -1
- package/src/agent/tools/stream-snapshot.ts +8 -3
- package/src/bundled-plugins/agent-browser/index.ts +18 -8
- package/src/bundled-plugins/memory/README.md +4 -1
- package/src/bundled-plugins/memory/belief-sentence.ts +50 -0
- package/src/bundled-plugins/memory/dreaming.ts +13 -6
- package/src/bundled-plugins/memory/load-memory.ts +22 -2
- package/src/bundled-plugins/memory/memory-logger.ts +1 -1
- package/src/capabilities/control-plane.ts +24 -0
- package/src/capabilities/index.ts +2 -0
- package/src/capabilities/runtime.ts +30 -0
- package/src/channels/manager.ts +41 -47
- package/src/channels/router.ts +11 -2
- package/src/cli/channel.ts +49 -12
- package/src/cli/hostd.ts +4 -3
- package/src/cli/logs.ts +2 -2
- package/src/cli/restart.ts +5 -3
- package/src/cli/shell.ts +2 -2
- package/src/cli/start.ts +2 -2
- package/src/cli/status.ts +2 -2
- package/src/cli/stop.ts +2 -2
- package/src/compose/restart.ts +4 -3
- package/src/compose/start.ts +2 -2
- package/src/compose/stop.ts +2 -2
- package/src/config/config.ts +10 -1
- package/src/config/providers.ts +61 -9
- package/src/container/controller.ts +104 -0
- package/src/container/index.ts +9 -0
- package/src/init/index.ts +1 -1
- package/src/init/instagram-auth.ts +189 -34
- package/src/inspect/logs-item.ts +2 -2
- package/src/mcp/client.ts +1 -1
- package/src/run/index.ts +21 -9
- package/src/run/{codex-fetch-observer.ts → llm-fetch-observer.ts} +182 -82
- package/src/sandbox/availability.ts +2 -2
- package/src/sandbox/build.ts +1 -1
- package/src/sandbox/policy.ts +2 -2
- package/src/secrets/discord-store.ts +4 -13
- package/src/secrets/instagram-store.ts +4 -13
- package/src/secrets/kakao-store.ts +4 -13
- package/src/secrets/line-store.ts +4 -13
- package/src/secrets/secrets-provider.ts +86 -0
- package/src/secrets/slack-store.ts +4 -13
- package/src/secrets/webex-store.ts +4 -13
- package/src/server/index.ts +2 -2
- package/src/skills/typeclaw-channel-instagram/SKILL.md +1 -1
- package/src/skills/typeclaw-config/SKILL.md +5 -3
- package/src/skills/typeclaw-plugins/SKILL.md +1 -1
- package/src/stream/broker.ts +4 -3
- package/src/stream/types.ts +1 -0
- package/typeclaw.schema.json +14 -0
|
@@ -10,6 +10,7 @@ import { type AgentGit, resolveAgentGit } from '@/git/resolve-agent-git'
|
|
|
10
10
|
import { defineTool, lsTool, readTool, type Subagent, writeTool } from '@/plugin'
|
|
11
11
|
import { formatLocalDate, formatLocalDateTime } from '@/shared'
|
|
12
12
|
|
|
13
|
+
import { firstBeliefSentence } from './belief-sentence'
|
|
13
14
|
import { checkCitationSupersetAcrossShards, summarizeMissingCitations } from './citation-superset'
|
|
14
15
|
import { parseCitations } from './citations'
|
|
15
16
|
import { deleteTopicShardTool } from './delete-tool'
|
|
@@ -717,8 +718,14 @@ function defaultShardFrontmatter(heading: string, tags?: string[]): ShardFrontma
|
|
|
717
718
|
return { heading, cites: 0, days: 0, lastReinforced: formatLocalDate(), ...(tags !== undefined ? { tags } : {}) }
|
|
718
719
|
}
|
|
719
720
|
|
|
721
|
+
// When the subagent omits a heading, synthesize one from the body: a `## heading`
|
|
722
|
+
// line if present (older shard shape), else the first belief sentence — which the
|
|
723
|
+
// channel-injection contract wants the heading to be. An existing subagent-authored
|
|
724
|
+
// heading is left untouched; runtime owns only cites/days/lastReinforced, not the
|
|
725
|
+
// heading text. Legacy title-like headings are recovered at render time instead
|
|
726
|
+
// (channelTopicEntry), never by silently rewriting subagent-authored content.
|
|
720
727
|
function synthesizeHeadingFromBody(body: string): string | undefined {
|
|
721
|
-
return body.match(/^##\s+(.+)$/m)?.[1]?.trim()
|
|
728
|
+
return body.match(/^##\s+(.+)$/m)?.[1]?.trim() ?? firstBeliefSentence(body)
|
|
722
729
|
}
|
|
723
730
|
|
|
724
731
|
function isEnoent(err: unknown): boolean {
|
|
@@ -1008,9 +1015,9 @@ A fragment with no useful content (a watermark-only marker, a near-duplicate, a
|
|
|
1008
1015
|
|
|
1009
1016
|
**4. Inherit the memory-logger's standards.** The memory-logger already filtered fragments using strict certainty rules (explicit / deductive / inductive). Your job is consolidation, not loosening the bar. If two fragments contradict, prefer the more recent. If a fragment is ambiguous in isolation but clarified by a later fragment, merge them under one topic. Never promote a single fragment from one day into a stable claim unless its certainty was already \`explicit\` or \`deductive\`.
|
|
1010
1017
|
|
|
1011
|
-
**5. Rebalance every run. Preserve every fact and every cited fragment id.** The shard set is a saturated surface (a fixed prompt-budget), not an append-only log — every run is consolidation, not just the runs that get new fragments. You may merge near-duplicate topics into one, split overloaded topics, rename unclear slugs/headings, and rewrite verbose conclusion paragraphs more tightly. What you must NOT do: drop a fragment id. The merged topic's \`fragments:\` list is the **union** of its source topics' fragment ids. The daily-stream GC depends on shard citations to keep evidence alive; an omitted id means the underlying fragment is permanently deleted on the next compaction. If two topics genuinely cover different facts, leave them separate — premature merging loses signal. If a new fragment contradicts an existing entry, replace the entry's conclusion paragraph to state the new current truth, and **move the old, now-overturned fragment id from \`fragments:\` into a \`superseded:\` list** in the same shard (the new fragment id goes under \`fragments:\`). Both lists keep the ids cited, so no evidence is lost — but \`superseded:\` marks the old evidence as history, not current truth, so retrieval no longer surfaces it as a hook for the new belief. Citation-superset invariant: every previously-cited fragment id must still appear cited in at least one shard after your run, in EITHER \`fragments:\` or \`superseded:\`. If you violate this, the runtime reverts your whole run.
|
|
1018
|
+
**5. Rebalance every run. Preserve every fact and every cited fragment id.** The shard set is a saturated surface (a fixed prompt-budget), not an append-only log — every run is consolidation, not just the runs that get new fragments. You may merge near-duplicate topics into one, split overloaded topics, rename unclear slugs/headings, and rewrite verbose conclusion paragraphs more tightly. What you must NOT do: drop a fragment id. The merged topic's \`fragments:\` list is the **union** of its source topics' fragment ids. The daily-stream GC depends on shard citations to keep evidence alive; an omitted id means the underlying fragment is permanently deleted on the next compaction. If two topics genuinely cover different facts, leave them separate — premature merging loses signal. If a new fragment contradicts an existing entry, replace the entry's conclusion paragraph to state the new current truth, and **move the old, now-overturned fragment id from \`fragments:\` into a \`superseded:\` list** in the same shard (the new fragment id goes under \`fragments:\`). Both lists keep the ids cited, so no evidence is lost — but \`superseded:\` marks the old evidence as history, not current truth, so retrieval no longer surfaces it as a hook for the new belief. **Reinforcement (a distinct path from contradiction):** when a new fragment REAFFIRMS, repeats, or user-corrects TOWARD the same current truth an existing shard already holds, do NOT drop it as already-known — it is new evidence from a later occurrence. Add the new fragment id under that shard's \`fragments:\` list. The runtime turns that citation into stronger \`cites\`, \`days\`, and \`lastReinforced\` signals — adding a citation IS how reinforcement happens; you never edit those numbers yourself. Do NOT move any old id into \`superseded:\` for a mere reinforcement (that is only for an actually-overturned prior truth). If the fragment is a user CORRECTION showing the agent has been repeating a specific WRONG version, also tighten the belief sentence to state the corrective guard explicitly — "X is not Y anymore; X is Z" — so the negative fact rides in the sentence a channel turn sees first, not just implied by the affirmative list. Add at most one pure-reinforcement citation per shard per day: a same-day repeat with no new correction detail is a burst, not a new day, and \`days\` (not raw \`cites\`) is what drives promotion. Citation-superset invariant: every previously-cited fragment id must still appear cited in at least one shard after your run, in EITHER \`fragments:\` or \`superseded:\`. If you violate this, the runtime reverts your whole run.
|
|
1012
1019
|
|
|
1013
|
-
**6. Write a compact belief, not an essay.** An ordinary belief topic's body is **one compact belief sentence** stating the current truth — a durable fact about the user, project, or environment — placed before \`fragments:\`. It carries the subject, the predicate (the preference/habit/fact/decision), and only the essential scope qualifier needed to avoid overgeneralizing ("for this repo", "when committing", "in host-stage code"). Do NOT explain the evidence, the history, or the reasoning ("because…") — the \`fragments:\` and \`superseded:\` citation lists carry that. No lists of preferences ("the user likes X, Y, Z"), no labels, no markdown headings, no multiple sentences. One topic per concept. Keep the sentence natural and keyword-rich (it is embedded and keyword-searched) — do not compress into telegraphic fragments like "bun/typecheck/lint". Smaller bodies let more topics stay in the directly-injected budget, so tightness is load-bearing, not cosmetic. Fragments may carry situational provenance — \`who\` (the attributed speaker) and \`where\` (the channel/room/platform). Fold these into the belief sentence ONLY when the situation is part of the durable fact ("In #incidents, Jisoo treats production-outage messages as drop-everything urgent") — not as routine provenance noise on every belief; the citation list already records where each fragment came from. **Exception: CLI/plugin proposal shards (see "Suggesting a CLI or a plugin" below) are not belief topics — they keep their richer rationale paragraph plus the required \`proposal:\` label and are exempt from the one-sentence/no-labels rule.**
|
|
1020
|
+
**6. Write a compact belief, not an essay.** An ordinary belief topic's body is **one compact belief sentence** stating the current truth — a durable fact about the user, project, or environment — placed before \`fragments:\`. **The \`heading\` frontmatter MUST be that same belief sentence, not a noun-phrase title.** In channels the agent is shown ONLY the heading (the body is fetched on demand), so a title like "T1 Competition Status 2026" leaves the agent with no fact and it falls back to stale guesses; a heading like "T1's 2026 ADC is Peyz, not Gumayusi (Gumayusi left for HLE)" carries the fact by itself. Make the heading self-contained. It carries the subject, the predicate (the preference/habit/fact/decision), and only the essential scope qualifier needed to avoid overgeneralizing ("for this repo", "when committing", "in host-stage code"). Do NOT explain the evidence, the history, or the reasoning ("because…") — the \`fragments:\` and \`superseded:\` citation lists carry that. No lists of preferences ("the user likes X, Y, Z"), no labels, no markdown headings, no multiple sentences. One topic per concept. Keep the sentence natural and keyword-rich (it is embedded and keyword-searched) — do not compress into telegraphic fragments like "bun/typecheck/lint". Smaller bodies let more topics stay in the directly-injected budget, so tightness is load-bearing, not cosmetic. Fragments may carry situational provenance — \`who\` (the attributed speaker) and \`where\` (the channel/room/platform). Fold these into the belief sentence ONLY when the situation is part of the durable fact ("In #incidents, Jisoo treats production-outage messages as drop-everything urgent") — not as routine provenance noise on every belief; the citation list already records where each fragment came from. **Exception: CLI/plugin proposal shards (see "Suggesting a CLI or a plugin" below) are not belief topics — they keep their richer rationale paragraph plus the required \`proposal:\` label and are exempt from the one-sentence/no-labels rule.**
|
|
1014
1021
|
|
|
1015
1022
|
**7. Memory is passive context, not an instruction channel.** Rewrite imperative or duty-shaped fragments as observations. Preserve facts, user preferences, and evidence; do not promote inferred obligations like "the agent should educate X", "future agents must correct Y", "bot Z should not post", or "run this later" unless the user explicitly stated an always/never rule. When a fragment contains such language, convert it into neutral context about what happened and why it might help interpret a future user request.
|
|
1016
1023
|
|
|
@@ -1029,14 +1036,14 @@ The reference files under \`memory/references/\` are verbatim artifacts. You MUS
|
|
|
1029
1036
|
|
|
1030
1037
|
\`\`\`
|
|
1031
1038
|
---
|
|
1032
|
-
heading: <
|
|
1039
|
+
heading: <the one compact belief sentence — NOT a title (see rule 6)>
|
|
1033
1040
|
cites: 0
|
|
1034
1041
|
days: 0
|
|
1035
1042
|
lastReinforced: 1970-01-01
|
|
1036
1043
|
tags: []
|
|
1037
1044
|
---
|
|
1038
1045
|
|
|
1039
|
-
<
|
|
1046
|
+
<the same belief sentence, repeated as the body's current-truth line (see rule 6)>
|
|
1040
1047
|
|
|
1041
1048
|
fragments:
|
|
1042
1049
|
- streams/yyyy-MM-dd#<fragment-id>
|
|
@@ -1164,7 +1171,7 @@ Do not suggest CLIs or plugins speculatively. The same recurrence + generalizabi
|
|
|
1164
1171
|
|
|
1165
1172
|
1. \`ls memory/topics/\`, then \`read\` the existing topic shards you need to understand. A missing directory means you start from empty.
|
|
1166
1173
|
2. For each JSONL daily stream undreamed-tail entry the user message lists, \`read\` the file with \`offset\` set to the first undreamed line. Read every undreamed tail before you start writing, then focus on fragment events' \`topic\` + \`body\` fields.
|
|
1167
|
-
3. Reason about what to consolidate AND about how to rebalance existing topics using the strength signals at the top of the user prompt.
|
|
1174
|
+
3. Reason about what to consolidate AND about how to rebalance existing topics using the strength signals at the top of the user prompt. For each useful fragment, choose one of four responses: **contradiction** (supersede the old belief), **reinforcement** (a fragment that reaffirms or user-corrects toward an existing shard's current truth — add its id to that shard's \`fragments:\`, per rule 5), **new topic**, or **drop**. A repeated correction or reaffirmation of an existing truth usually REINFORCES the existing shard by adding the new citation — it is NOT "already-known, drop." Drop only same-day/no-new-signal repeats and non-generalizable noise. Most existing topics will keep their shape; a few merge, split, rename, reinforce, or terse-demote every run.
|
|
1168
1175
|
4. Write only the shards that changed. Even if no new fragments earned promotion, a rebalance pass (merging two near-duplicates, renaming an unclear shard, tightening a single weak old topic) is still a productive run. \`write\` overwrites one shard; \`delete_topic_shard\` removes obsolete shards after their citations have moved. Remember: every fragment id cited before your run must still appear in at least one shard after your run. The runtime enforces this mechanically and will revert your whole run if you drop an id.
|
|
1169
1176
|
5. Decide whether any procedure in the new fragments meets the muscle-memory bar above, and which of the three forms fits.
|
|
1170
1177
|
- **Form A (skill):** \`ls\` \`memory/skills/\` to see what already exists, \`read\` any candidate's existing \`SKILL.md\` if you might be refining it, then \`write\` the new or refined skill at \`memory/skills/<name>/SKILL.md\` with the frontmatter shape shown above.
|
|
@@ -3,6 +3,7 @@ import { join } from 'node:path'
|
|
|
3
3
|
|
|
4
4
|
import type { SessionOrigin } from '@/agent/session-origin'
|
|
5
5
|
|
|
6
|
+
import { firstBeliefSentence, isTitleLikeHeading } from './belief-sentence'
|
|
6
7
|
import { buildInjectionPlan, type InjectionPlan } from './injection-plan'
|
|
7
8
|
import { loadAllShards, type TopicShard } from './load-shards'
|
|
8
9
|
import { topicsDir } from './paths'
|
|
@@ -125,7 +126,9 @@ export function renderRetrievedMemorySection(
|
|
|
125
126
|
const provenance = renderProvenanceLine(item)
|
|
126
127
|
if (provenance !== null) lines.push(provenance)
|
|
127
128
|
lines.push(item.excerpt.trimEnd(), '')
|
|
128
|
-
} else if (item.source === 'topic'
|
|
129
|
+
} else if (item.source === 'topic') {
|
|
130
|
+
lines.push(channelTopicEntry(item.heading, item.key, item.excerpt))
|
|
131
|
+
} else if (item.source === 'reference') {
|
|
129
132
|
lines.push(topicIndexEntry(item.heading, item.key))
|
|
130
133
|
} else {
|
|
131
134
|
const provenance = renderProvenanceLine(item)
|
|
@@ -147,8 +150,13 @@ export function renderTopicIndexMemorySection(
|
|
|
147
150
|
const lines = ['# Memory', '', MEMORY_FRAMING, '']
|
|
148
151
|
if (options.origin?.kind === 'channel') lines.push(...CHANNEL_MEMORY_BOUNDARY, '')
|
|
149
152
|
lines.push(topicIndexDirective(options), '')
|
|
153
|
+
const channel = options.origin?.kind === 'channel'
|
|
150
154
|
for (const shard of shards) {
|
|
151
|
-
lines.push(
|
|
155
|
+
lines.push(
|
|
156
|
+
channel
|
|
157
|
+
? channelTopicEntry(shard.frontmatter.heading, shard.slug, shard.body)
|
|
158
|
+
: topicIndexEntry(shard.frontmatter.heading, shard.slug),
|
|
159
|
+
)
|
|
152
160
|
}
|
|
153
161
|
return lines.join('\n').trimEnd()
|
|
154
162
|
}
|
|
@@ -166,6 +174,18 @@ function topicIndexEntry(heading: string, slug: string): string {
|
|
|
166
174
|
return `- ${heading} \`${slug}\``
|
|
167
175
|
}
|
|
168
176
|
|
|
177
|
+
// Channel turns show headings only (memory-bleed defense). That is safe ONLY when
|
|
178
|
+
// the heading is the shard's self-contained belief sentence. Legacy/dreaming shards
|
|
179
|
+
// put a title in `heading` and the fact in the body, so a title-like heading would
|
|
180
|
+
// leak a fact-free label; recover the one belief sentence from the body instead
|
|
181
|
+
// (still one sentence, never the full body). The slug rides along so the agent can
|
|
182
|
+
// `memory_search({ topic })` for the rest.
|
|
183
|
+
function channelTopicEntry(heading: string, slug: string, body: string): string {
|
|
184
|
+
if (!isTitleLikeHeading(heading, slug)) return topicIndexEntry(heading, slug)
|
|
185
|
+
const belief = firstBeliefSentence(body)
|
|
186
|
+
return belief === undefined ? topicIndexEntry(heading, slug) : `- ${belief} \`${slug}\``
|
|
187
|
+
}
|
|
188
|
+
|
|
169
189
|
function topicIndexDirective(options: Pick<LoadMemoryOptions, 'origin'>): string {
|
|
170
190
|
if (options.origin?.kind === 'channel') {
|
|
171
191
|
return 'Memory shown as headings only in channels. Call `memory_search({ topic: "<slug>" })` with a slug below to read a full body.'
|
|
@@ -118,7 +118,7 @@ Capture-worthy categories:
|
|
|
118
118
|
- **Decisions with reasoning.** "We chose X over Y because Z" when future sessions must honor X.
|
|
119
119
|
- **Reproducible workarounds and debugging insights.** A config that worked, flag combination, procedure, root cause, or non-obvious fix.
|
|
120
120
|
- **In-transcript changed minds.** Capture "actually, scratch that" only when the prior position is explicit. Do not compare against \`memory/topics/\`.
|
|
121
|
-
- **Corrections the user made to the agent.** Especially when the agent confidently asserted something false that future sessions may repeat.
|
|
121
|
+
- **Corrections the user made to the agent.** Especially when the agent confidently asserted something false that future sessions may repeat. When the agent stated a factual claim and the user corrected it, capture the corrected fact as a distinct, evidence-anchored fragment EVEN IF it sounds like something memory may already know — you cannot inspect \`memory/topics/\`, so your job is to preserve this later correction occurrence so dreaming can reinforce and sharpen the stored belief (repeated corrections are how a contested fact gets stronger, not noise to skip). Anchor the body to the correction: what the agent said, what the user corrected it to. This is semantic and **language-independent** — recognize corrections in any language (Korean, Japanese, Chinese, Arabic, and every Latin-script language), not from English cue phrases.
|
|
122
122
|
- **Content the user explicitly taught, trained on, or asked the agent to remember.** Capture the substance taught, not merely that teaching happened. Treat these six intent families as representative, not exhaustive:
|
|
123
123
|
- **Teach / explain-so-you-know.** "let me teach you Y", "you should know that…", "이건 알아둬".
|
|
124
124
|
- **Train / point-and-learn.** "study this", "look at how X did it and learn", "보고 배워".
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { type Controller, type DeploymentProfile, resolveController, resolveDeploymentProfile } from '@/container'
|
|
2
|
+
|
|
3
|
+
// The host-stage capability bag: what the host process (CLI / hostd / a future
|
|
4
|
+
// managed control task) can DO to a container. Assembled once at the host-stage
|
|
5
|
+
// composition root and passed to the modules that need it — NOT a service
|
|
6
|
+
// locator (build at the root, hand specific capabilities down).
|
|
7
|
+
//
|
|
8
|
+
// Only `controller` today; restartSupervisor / portBroker / credentialRenewers
|
|
9
|
+
// slot in here as they are extracted (see the capability-composition design).
|
|
10
|
+
export type ControlPlaneCapabilities = {
|
|
11
|
+
controller: Controller
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
// Composes the host-stage capabilities for a deployment profile. `host` uses
|
|
15
|
+
// local Docker; `managed` (no runtime yet) would use platform impls. The
|
|
16
|
+
// profile is resolved once here so the whole bag reflects one coherent
|
|
17
|
+
// environment decision.
|
|
18
|
+
export function createControlPlaneCapabilities(
|
|
19
|
+
profile: DeploymentProfile = resolveDeploymentProfile(),
|
|
20
|
+
): ControlPlaneCapabilities {
|
|
21
|
+
return {
|
|
22
|
+
controller: resolveController(profile),
|
|
23
|
+
}
|
|
24
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { join } from 'node:path'
|
|
2
|
+
|
|
3
|
+
import { type RuntimeSecretsProvider, resolveRuntimeSecretsProvider } from '@/secrets/secrets-provider'
|
|
4
|
+
|
|
5
|
+
// The container-stage capability bag: what the agent runtime (`typeclaw run`)
|
|
6
|
+
// can CALL to reach durable host-side substrate. Assembled once at the
|
|
7
|
+
// container-stage composition root and passed to the modules that need it —
|
|
8
|
+
// build at the root, hand specific capabilities down (not a service locator).
|
|
9
|
+
//
|
|
10
|
+
// `secrets` is nullable: it degrades to null when no write-back backend is
|
|
11
|
+
// wired (hostd triple absent, or a managed profile without write-back yet), so
|
|
12
|
+
// the runtime boots without crashing. restarter / portForwarder / ingress slot
|
|
13
|
+
// in here as they are extracted (see the capability-composition design).
|
|
14
|
+
export type RuntimeCapabilities = {
|
|
15
|
+
secrets: RuntimeSecretsProvider | null
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
// Composes the container-stage capabilities. `secretsPath` is the mounted
|
|
19
|
+
// secrets.json the runtime reads (defaults to <cwd>/secrets.json, which is
|
|
20
|
+
// /agent/secrets.json in the container). Env is injectable for tests. (No
|
|
21
|
+
// profile param yet — secrets resolution keys off the env triple; the
|
|
22
|
+
// deployment profile enters here when a managed secrets impl selects on it.)
|
|
23
|
+
export function createRuntimeCapabilities(
|
|
24
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
25
|
+
secretsPath: string = join(process.cwd(), 'secrets.json'),
|
|
26
|
+
): RuntimeCapabilities {
|
|
27
|
+
return {
|
|
28
|
+
secrets: resolveRuntimeSecretsProvider(env, secretsPath),
|
|
29
|
+
}
|
|
30
|
+
}
|
package/src/channels/manager.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { SecretsDiscordCredentialStore } from '@/secrets/discord-store'
|
|
|
7
7
|
import { SecretsInstagramCredentialStore } from '@/secrets/instagram-store'
|
|
8
8
|
import { SecretsKakaoCredentialStore } from '@/secrets/kakao-store'
|
|
9
9
|
import { SecretsLineCredentialStore } from '@/secrets/line-store'
|
|
10
|
+
import type { RuntimeSecretsProvider } from '@/secrets/secrets-provider'
|
|
10
11
|
import { SecretsSlackCredentialStore } from '@/secrets/slack-store'
|
|
11
12
|
import { SecretsBackend } from '@/secrets/storage'
|
|
12
13
|
import { SecretsWebexCredentialStore } from '@/secrets/webex-store'
|
|
@@ -66,6 +67,13 @@ export type ChannelManagerOptions = {
|
|
|
66
67
|
aliasesRef?: () => readonly string[]
|
|
67
68
|
logger?: ChannelManagerLogger
|
|
68
69
|
env?: NodeJS.ProcessEnv
|
|
70
|
+
// The container-stage secrets provider for personal-account adapters
|
|
71
|
+
// (line/kakaotalk/slack/discord/webex/instagram write-back + read). Resolved
|
|
72
|
+
// ONCE at the composition root (createRuntimeCapabilities in src/run/index.ts)
|
|
73
|
+
// and threaded in here — the manager never resolves it from env itself. Null
|
|
74
|
+
// (or omitted) skips those adapters; see the note above the
|
|
75
|
+
// createContainer*CredentialStore factories.
|
|
76
|
+
secretsProvider?: RuntimeSecretsProvider | null
|
|
69
77
|
// Production wiring passes a factory that builds sessions with the full
|
|
70
78
|
// runtime plumbing (channelRouter, stream, plugins, reloadRegistry). When
|
|
71
79
|
// omitted, the router falls back to a hollow factory that creates sessions
|
|
@@ -267,7 +275,7 @@ export function createChannelManager(options: ChannelManagerOptions): ChannelMan
|
|
|
267
275
|
})
|
|
268
276
|
}
|
|
269
277
|
if (name === 'line') {
|
|
270
|
-
const credentialsStore = createContainerLineCredentialStore(options.agentDir,
|
|
278
|
+
const credentialsStore = createContainerLineCredentialStore(options.agentDir, options.secretsProvider ?? null)
|
|
271
279
|
if (credentialsStore === null) return null
|
|
272
280
|
return createLine({
|
|
273
281
|
router,
|
|
@@ -278,7 +286,10 @@ export function createChannelManager(options: ChannelManagerOptions): ChannelMan
|
|
|
278
286
|
})
|
|
279
287
|
}
|
|
280
288
|
if (name === 'instagram') {
|
|
281
|
-
const credentialsStore = createContainerInstagramCredentialStore(
|
|
289
|
+
const credentialsStore = createContainerInstagramCredentialStore(
|
|
290
|
+
options.agentDir,
|
|
291
|
+
options.secretsProvider ?? null,
|
|
292
|
+
)
|
|
282
293
|
if (credentialsStore === null) return null
|
|
283
294
|
return createInstagram({
|
|
284
295
|
router,
|
|
@@ -289,7 +300,7 @@ export function createChannelManager(options: ChannelManagerOptions): ChannelMan
|
|
|
289
300
|
})
|
|
290
301
|
}
|
|
291
302
|
if (name === 'kakaotalk') {
|
|
292
|
-
const credentialsStore = createContainerKakaoCredentialStore(options.agentDir,
|
|
303
|
+
const credentialsStore = createContainerKakaoCredentialStore(options.agentDir, options.secretsProvider ?? null)
|
|
293
304
|
if (credentialsStore === null) return null
|
|
294
305
|
return createKakaotalk({
|
|
295
306
|
router,
|
|
@@ -300,7 +311,7 @@ export function createChannelManager(options: ChannelManagerOptions): ChannelMan
|
|
|
300
311
|
})
|
|
301
312
|
}
|
|
302
313
|
if (name === 'slack') {
|
|
303
|
-
const credentialsStore = createContainerSlackCredentialStore(options.agentDir,
|
|
314
|
+
const credentialsStore = createContainerSlackCredentialStore(options.agentDir, options.secretsProvider ?? null)
|
|
304
315
|
if (credentialsStore === null) return null
|
|
305
316
|
return createSlackUser({
|
|
306
317
|
router,
|
|
@@ -311,7 +322,7 @@ export function createChannelManager(options: ChannelManagerOptions): ChannelMan
|
|
|
311
322
|
})
|
|
312
323
|
}
|
|
313
324
|
if (name === 'discord') {
|
|
314
|
-
const credentialsStore = createContainerDiscordCredentialStore(options.agentDir,
|
|
325
|
+
const credentialsStore = createContainerDiscordCredentialStore(options.agentDir, options.secretsProvider ?? null)
|
|
315
326
|
if (credentialsStore === null) return null
|
|
316
327
|
return createDiscordUser({
|
|
317
328
|
router,
|
|
@@ -322,7 +333,7 @@ export function createChannelManager(options: ChannelManagerOptions): ChannelMan
|
|
|
322
333
|
})
|
|
323
334
|
}
|
|
324
335
|
if (name === 'webex') {
|
|
325
|
-
const credentialsStore = createContainerWebexCredentialStore(options.agentDir,
|
|
336
|
+
const credentialsStore = createContainerWebexCredentialStore(options.agentDir, options.secretsProvider ?? null)
|
|
326
337
|
if (credentialsStore === null) return null
|
|
327
338
|
return createWebex({
|
|
328
339
|
router,
|
|
@@ -570,33 +581,21 @@ const TOKEN_ENV: Record<
|
|
|
570
581
|
'webex-bot': ['WEBEX_BOT_TOKEN'],
|
|
571
582
|
}
|
|
572
583
|
|
|
573
|
-
// Personal-account adapters (line/kakaotalk/slack/discord/webex) need
|
|
574
|
-
//
|
|
575
|
-
//
|
|
576
|
-
//
|
|
577
|
-
//
|
|
578
|
-
//
|
|
579
|
-
// so this is the only place the missing triple is caught.
|
|
580
|
-
type HostdContainerCredentials = { hostdUrl: string; restartToken: string; containerName: string }
|
|
581
|
-
|
|
582
|
-
function resolveHostdContainerCredentials(env: NodeJS.ProcessEnv): HostdContainerCredentials | null {
|
|
583
|
-
const hostdUrl = env.TYPECLAW_HOSTD_URL
|
|
584
|
-
const restartToken = env.TYPECLAW_HOSTD_TOKEN
|
|
585
|
-
const containerName = env.TYPECLAW_CONTAINER_NAME
|
|
586
|
-
if (!hostdUrl || !restartToken || !containerName) return null
|
|
587
|
-
return { hostdUrl, restartToken, containerName }
|
|
588
|
-
}
|
|
589
|
-
|
|
584
|
+
// Personal-account adapters (line/kakaotalk/slack/discord/webex) need a
|
|
585
|
+
// container-stage secrets provider. It's resolved ONCE at the composition root
|
|
586
|
+
// (createRuntimeCapabilities in src/run/index.ts) and threaded in via
|
|
587
|
+
// `secretsProvider`; a null value (hostd triple absent — e.g. a lost first-boot
|
|
588
|
+
// spawn race, or a managed profile with no write-back wired) lets buildAdapter
|
|
589
|
+
// skip the adapter instead of crashing the whole channel manager.
|
|
590
590
|
function createContainerDiscordCredentialStore(
|
|
591
591
|
agentDir: string,
|
|
592
|
-
|
|
592
|
+
secretsProvider: RuntimeSecretsProvider | null,
|
|
593
593
|
): SecretsDiscordCredentialStore | null {
|
|
594
|
-
|
|
595
|
-
if (creds === null) return null
|
|
594
|
+
if (secretsProvider === null) return null
|
|
596
595
|
return new SecretsDiscordCredentialStore({
|
|
597
596
|
mode: 'container',
|
|
598
597
|
secretsPath: join(agentDir, 'secrets.json'),
|
|
599
|
-
|
|
598
|
+
hostProvider: secretsProvider,
|
|
600
599
|
})
|
|
601
600
|
}
|
|
602
601
|
|
|
@@ -616,14 +615,13 @@ function buildDiscordSignature(agentDir: string): { signature: string; missing:
|
|
|
616
615
|
|
|
617
616
|
function createContainerSlackCredentialStore(
|
|
618
617
|
agentDir: string,
|
|
619
|
-
|
|
618
|
+
secretsProvider: RuntimeSecretsProvider | null,
|
|
620
619
|
): SecretsSlackCredentialStore | null {
|
|
621
|
-
|
|
622
|
-
if (creds === null) return null
|
|
620
|
+
if (secretsProvider === null) return null
|
|
623
621
|
return new SecretsSlackCredentialStore({
|
|
624
622
|
mode: 'container',
|
|
625
623
|
secretsPath: join(agentDir, 'secrets.json'),
|
|
626
|
-
|
|
624
|
+
hostProvider: secretsProvider,
|
|
627
625
|
})
|
|
628
626
|
}
|
|
629
627
|
|
|
@@ -643,14 +641,13 @@ function buildSlackSignature(agentDir: string): { signature: string; missing: st
|
|
|
643
641
|
|
|
644
642
|
function createContainerWebexCredentialStore(
|
|
645
643
|
agentDir: string,
|
|
646
|
-
|
|
644
|
+
secretsProvider: RuntimeSecretsProvider | null,
|
|
647
645
|
): SecretsWebexCredentialStore | null {
|
|
648
|
-
|
|
649
|
-
if (creds === null) return null
|
|
646
|
+
if (secretsProvider === null) return null
|
|
650
647
|
return new SecretsWebexCredentialStore({
|
|
651
648
|
mode: 'container',
|
|
652
649
|
secretsPath: join(agentDir, 'secrets.json'),
|
|
653
|
-
|
|
650
|
+
hostProvider: secretsProvider,
|
|
654
651
|
})
|
|
655
652
|
}
|
|
656
653
|
|
|
@@ -670,14 +667,13 @@ function buildWebexSignature(agentDir: string): { signature: string; missing: st
|
|
|
670
667
|
|
|
671
668
|
function createContainerKakaoCredentialStore(
|
|
672
669
|
agentDir: string,
|
|
673
|
-
|
|
670
|
+
secretsProvider: RuntimeSecretsProvider | null,
|
|
674
671
|
): SecretsKakaoCredentialStore | null {
|
|
675
|
-
|
|
676
|
-
if (creds === null) return null
|
|
672
|
+
if (secretsProvider === null) return null
|
|
677
673
|
return new SecretsKakaoCredentialStore({
|
|
678
674
|
mode: 'container',
|
|
679
675
|
secretsPath: join(agentDir, 'secrets.json'),
|
|
680
|
-
|
|
676
|
+
hostProvider: secretsProvider,
|
|
681
677
|
})
|
|
682
678
|
}
|
|
683
679
|
|
|
@@ -697,14 +693,13 @@ function buildKakaotalkSignature(agentDir: string): { signature: string; missing
|
|
|
697
693
|
|
|
698
694
|
function createContainerLineCredentialStore(
|
|
699
695
|
agentDir: string,
|
|
700
|
-
|
|
696
|
+
secretsProvider: RuntimeSecretsProvider | null,
|
|
701
697
|
): SecretsLineCredentialStore | null {
|
|
702
|
-
|
|
703
|
-
if (creds === null) return null
|
|
698
|
+
if (secretsProvider === null) return null
|
|
704
699
|
return new SecretsLineCredentialStore({
|
|
705
700
|
mode: 'container',
|
|
706
701
|
secretsPath: join(agentDir, 'secrets.json'),
|
|
707
|
-
|
|
702
|
+
hostProvider: secretsProvider,
|
|
708
703
|
})
|
|
709
704
|
}
|
|
710
705
|
|
|
@@ -724,14 +719,13 @@ function buildLineSignature(agentDir: string): { signature: string; missing: str
|
|
|
724
719
|
|
|
725
720
|
function createContainerInstagramCredentialStore(
|
|
726
721
|
agentDir: string,
|
|
727
|
-
|
|
722
|
+
secretsProvider: RuntimeSecretsProvider | null,
|
|
728
723
|
): SecretsInstagramCredentialStore | null {
|
|
729
|
-
|
|
730
|
-
if (creds === null) return null
|
|
724
|
+
if (secretsProvider === null) return null
|
|
731
725
|
return new SecretsInstagramCredentialStore({
|
|
732
726
|
mode: 'container',
|
|
733
727
|
secretsPath: join(agentDir, 'secrets.json'),
|
|
734
|
-
|
|
728
|
+
hostProvider: secretsProvider,
|
|
735
729
|
})
|
|
736
730
|
}
|
|
737
731
|
|
package/src/channels/router.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { applyTurnThinkingLevel, getQuestionSignal, type QuestionSignal } from '
|
|
|
9
9
|
import { resolveFallbackChain } from '@/agent/model-fallback'
|
|
10
10
|
import { applyModelRuntimeOverrides } from '@/agent/model-overrides'
|
|
11
11
|
import { forgetSharedLoopGuardTool } from '@/agent/plugin-tools'
|
|
12
|
-
import {
|
|
12
|
+
import { detectHardProviderError, isFailoverWorthy, subscribeProviderErrors } from '@/agent/provider-error'
|
|
13
13
|
import type { RestartHandoff } from '@/agent/restart-handoff'
|
|
14
14
|
import type { ChannelParticipant, SessionOrigin } from '@/agent/session-origin'
|
|
15
15
|
import { renderSubagentCompletionReminder } from '@/agent/subagent-completion-reminder'
|
|
@@ -2654,7 +2654,7 @@ export function createChannelRouter(options: CreateChannelRouterOptions): Channe
|
|
|
2654
2654
|
currentModelRef: live.activeModelRef,
|
|
2655
2655
|
session: live.session,
|
|
2656
2656
|
text: promptText,
|
|
2657
|
-
shouldFailover: (err) =>
|
|
2657
|
+
shouldFailover: (err) => isFailoverWorthy(err.message),
|
|
2658
2658
|
setModelForRef: async (ref) => {
|
|
2659
2659
|
await live.session.setModel(applyModelRuntimeOverrides(resolveModel(ref), ref))
|
|
2660
2660
|
live.activeModelRef = ref
|
|
@@ -2694,6 +2694,15 @@ export function createChannelRouter(options: CreateChannelRouterOptions): Channe
|
|
|
2694
2694
|
logger.info(`[channels] ${live.keyId} prompted elapsed_ms=${now() - promptStart}`)
|
|
2695
2695
|
} catch (err) {
|
|
2696
2696
|
logger.error(`[channels] ${live.keyId}: prompt threw: ${describe(err)}`)
|
|
2697
|
+
// Fallback is exhausted by now (promptPersistentTurnWithFallback only
|
|
2698
|
+
// throws after rotating every eligible ref), so a recognizable provider
|
|
2699
|
+
// failure is terminal for this turn. Stage a redacted notice for the
|
|
2700
|
+
// `finally` poster — but never clobber a soft error already captured for
|
|
2701
|
+
// this turnSeq by subscribeProviderErrors (first-detected wins).
|
|
2702
|
+
const hardProviderError = detectHardProviderError(err)
|
|
2703
|
+
if (hardProviderError !== null && live.pendingProviderError?.turnSeq !== live.turnSeq) {
|
|
2704
|
+
live.pendingProviderError = { turnSeq: live.turnSeq, safeMessage: hardProviderError.safeMessage }
|
|
2705
|
+
}
|
|
2697
2706
|
live.consecutiveSends.clear()
|
|
2698
2707
|
live.lastSentText.clear()
|
|
2699
2708
|
live.lastSendLeafId = null
|
package/src/cli/channel.ts
CHANGED
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
type ChannelListEntry,
|
|
13
13
|
type GithubConfigCleanup,
|
|
14
14
|
} from '@/config/channels-mutation'
|
|
15
|
-
import {
|
|
15
|
+
import { resolveController } from '@/container'
|
|
16
16
|
import {
|
|
17
17
|
CHANNEL_KINDS,
|
|
18
18
|
appendOrReplaceEnvKey,
|
|
@@ -37,7 +37,7 @@ import {
|
|
|
37
37
|
type WebexAuthResult,
|
|
38
38
|
} from '@/init'
|
|
39
39
|
import { runDiscordBootstrap } from '@/init/discord-auth'
|
|
40
|
-
import { runInstagramBootstrap } from '@/init/instagram-auth'
|
|
40
|
+
import { runInstagramBootstrap, type InstagramLoginCallbacks } from '@/init/instagram-auth'
|
|
41
41
|
import { runKakaotalkBootstrap } from '@/init/kakaotalk-auth'
|
|
42
42
|
import { runLineBootstrap } from '@/init/line-auth'
|
|
43
43
|
import { runSlackBootstrap } from '@/init/slack-auth'
|
|
@@ -469,7 +469,12 @@ async function runInstagramReauth(cwd: string): Promise<void> {
|
|
|
469
469
|
const creds = await promptInstagramCredentials()
|
|
470
470
|
const s = spinner()
|
|
471
471
|
s.start('Logging in to Instagram...')
|
|
472
|
-
const result = await runInstagramBootstrap({
|
|
472
|
+
const result = await runInstagramBootstrap({
|
|
473
|
+
username: creds.username,
|
|
474
|
+
password: creds.password,
|
|
475
|
+
agentDir: cwd,
|
|
476
|
+
callbacks: instagramLoginCallbacks({ pause: () => s.stop(), resume: (message) => s.start(message) }),
|
|
477
|
+
})
|
|
473
478
|
if (!result.ok) {
|
|
474
479
|
s.stop(`Instagram login failed: ${result.reason}`)
|
|
475
480
|
process.exit(1)
|
|
@@ -575,7 +580,8 @@ async function maybePromptCredentialRefresh(
|
|
|
575
580
|
label: string,
|
|
576
581
|
verbPast: 're-authenticated' | 'credentials updated',
|
|
577
582
|
): Promise<void> {
|
|
578
|
-
const
|
|
583
|
+
const controller = resolveController()
|
|
584
|
+
const current = await controller.status({ cwd }).catch(() => null)
|
|
579
585
|
if (current === null || current.kind !== 'running') {
|
|
580
586
|
done({
|
|
581
587
|
title: c.green(`${label} ${verbPast}.`),
|
|
@@ -603,12 +609,12 @@ async function maybePromptCredentialRefresh(
|
|
|
603
609
|
return
|
|
604
610
|
}
|
|
605
611
|
|
|
606
|
-
const stopped = await stop({ cwd })
|
|
612
|
+
const stopped = await controller.stop({ cwd })
|
|
607
613
|
if (!stopped.ok) {
|
|
608
614
|
console.error(errorLine(`Restart failed during stop: ${stopped.reason}`))
|
|
609
615
|
process.exit(1)
|
|
610
616
|
}
|
|
611
|
-
const started = await start({ cwd, preferredHostPort: config.port, cliEntry: process.argv[1] })
|
|
617
|
+
const started = await controller.start({ cwd, preferredHostPort: config.port, cliEntry: process.argv[1] })
|
|
612
618
|
if (!started.ok) {
|
|
613
619
|
console.error(errorLine(`Restart failed during start: ${started.reason}`))
|
|
614
620
|
process.exit(1)
|
|
@@ -1018,10 +1024,11 @@ async function collectCredentials(
|
|
|
1018
1024
|
return { channel, webexBotToken: await promptWebexToken() }
|
|
1019
1025
|
case 'instagram': {
|
|
1020
1026
|
const creds = await promptInstagramCredentials()
|
|
1027
|
+
const callbacks = instagramLoginCallbacks(lineSpinnerHolder ? holderSpinnerControl(lineSpinnerHolder) : undefined)
|
|
1021
1028
|
return {
|
|
1022
1029
|
channel,
|
|
1023
1030
|
runInstagramAuth: ({ cwd: agentDir }) =>
|
|
1024
|
-
runInstagramBootstrap({ username: creds.username, password: creds.password, agentDir }),
|
|
1031
|
+
runInstagramBootstrap({ username: creds.username, password: creds.password, agentDir, callbacks }),
|
|
1025
1032
|
}
|
|
1026
1033
|
}
|
|
1027
1034
|
case 'line': {
|
|
@@ -1558,7 +1565,7 @@ async function promptInstagramCredentials(): Promise<{ username: string; passwor
|
|
|
1558
1565
|
[
|
|
1559
1566
|
'Instagram authentication uses a personal account.',
|
|
1560
1567
|
'Messages will be sent and received under this account.',
|
|
1561
|
-
'
|
|
1568
|
+
'If the account has 2FA or triggers a checkpoint, you will be prompted for the verification code here.',
|
|
1562
1569
|
].join('\n'),
|
|
1563
1570
|
'About to log in to Instagram',
|
|
1564
1571
|
)
|
|
@@ -1581,6 +1588,32 @@ async function promptInstagramCredentials(): Promise<{ username: string; passwor
|
|
|
1581
1588
|
return { username, password: pwd }
|
|
1582
1589
|
}
|
|
1583
1590
|
|
|
1591
|
+
// The login spinner ('Logging in to Instagram...') keeps animating while
|
|
1592
|
+
// Instagram's 2FA/checkpoint step waits on a human, and would repaint over the
|
|
1593
|
+
// code prompt. Pause it around the prompt so the input line stays legible, then
|
|
1594
|
+
// resume with a "waiting" message — same control the LINE PIN flow uses.
|
|
1595
|
+
function instagramLoginCallbacks(spinnerControl?: LineAuthSpinnerControl): InstagramLoginCallbacks {
|
|
1596
|
+
const promptCode = async (message: string): Promise<string | null> => {
|
|
1597
|
+
spinnerControl?.pause()
|
|
1598
|
+
const code = await text({
|
|
1599
|
+
message,
|
|
1600
|
+
validate: (value) => (value && value.trim().length > 0 ? undefined : 'A verification code is required'),
|
|
1601
|
+
})
|
|
1602
|
+
if (isCancel(code)) return null
|
|
1603
|
+
spinnerControl?.resume('Verifying the Instagram code...')
|
|
1604
|
+
return code
|
|
1605
|
+
}
|
|
1606
|
+
|
|
1607
|
+
return {
|
|
1608
|
+
onTwoFactorCode: () => promptCode('Enter the Instagram 2FA code from your authenticator app or SMS'),
|
|
1609
|
+
onChallengeCode: async ({ contactPoint }) => {
|
|
1610
|
+
const where = contactPoint === '' ? 'your email or phone' : contactPoint
|
|
1611
|
+
const code = await promptCode(`Enter the Instagram verification code sent to ${where}`)
|
|
1612
|
+
return code === null ? null : { code }
|
|
1613
|
+
},
|
|
1614
|
+
}
|
|
1615
|
+
}
|
|
1616
|
+
|
|
1584
1617
|
type LinePromptResult =
|
|
1585
1618
|
| { method: 'qr'; callbacks: { onQRUrl: (url: string) => Promise<void>; onPincode: (pin: string) => void } }
|
|
1586
1619
|
| {
|
|
@@ -1735,7 +1768,9 @@ function reportProgress(
|
|
|
1735
1768
|
const s = spinner()
|
|
1736
1769
|
s.start(START_MESSAGES[event.step])
|
|
1737
1770
|
spinners[event.step] = s
|
|
1738
|
-
if (event.step === 'line-auth' && lineSpinnerHolder)
|
|
1771
|
+
if ((event.step === 'line-auth' || event.step === 'instagram-auth') && lineSpinnerHolder) {
|
|
1772
|
+
lineSpinnerHolder.current = s
|
|
1773
|
+
}
|
|
1739
1774
|
return
|
|
1740
1775
|
}
|
|
1741
1776
|
|
|
@@ -1748,6 +1783,7 @@ function reportProgress(
|
|
|
1748
1783
|
s.stop(reportLineAuth(event.result))
|
|
1749
1784
|
break
|
|
1750
1785
|
case 'instagram-auth':
|
|
1786
|
+
if (lineSpinnerHolder) lineSpinnerHolder.current = null
|
|
1751
1787
|
s.stop(reportInstagramAuth(event.result))
|
|
1752
1788
|
break
|
|
1753
1789
|
case 'kakaotalk-auth':
|
|
@@ -1823,7 +1859,8 @@ async function maybePromptRestart(
|
|
|
1823
1859
|
verb: 'added' | 'removed' = 'added',
|
|
1824
1860
|
): Promise<void> {
|
|
1825
1861
|
const label = CHANNEL_LABELS[channel]
|
|
1826
|
-
const
|
|
1862
|
+
const controller = resolveController()
|
|
1863
|
+
const current = await controller.status({ cwd }).catch(() => null)
|
|
1827
1864
|
if (current === null || current.kind !== 'running') {
|
|
1828
1865
|
done({
|
|
1829
1866
|
title: c.green(`${label} channel ${verb}.`),
|
|
@@ -1850,12 +1887,12 @@ async function maybePromptRestart(
|
|
|
1850
1887
|
return
|
|
1851
1888
|
}
|
|
1852
1889
|
|
|
1853
|
-
const stopped = await stop({ cwd })
|
|
1890
|
+
const stopped = await controller.stop({ cwd })
|
|
1854
1891
|
if (!stopped.ok) {
|
|
1855
1892
|
console.error(errorLine(`Restart failed during stop: ${stopped.reason}`))
|
|
1856
1893
|
process.exit(1)
|
|
1857
1894
|
}
|
|
1858
|
-
const started = await start({ cwd, preferredHostPort: config.port, cliEntry: process.argv[1] })
|
|
1895
|
+
const started = await controller.start({ cwd, preferredHostPort: config.port, cliEntry: process.argv[1] })
|
|
1859
1896
|
if (!started.ok) {
|
|
1860
1897
|
console.error(errorLine(`Restart failed during start: ${started.reason}`))
|
|
1861
1898
|
process.exit(1)
|
package/src/cli/hostd.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { defineCommand } from 'citty'
|
|
2
2
|
|
|
3
3
|
import { loadConfigSync, validateConfig, type Config, type ValidateConfigResult } from '@/config'
|
|
4
|
-
import {
|
|
4
|
+
import { resolveController, type StartOptions, type StartResult, type StopResult } from '@/container'
|
|
5
5
|
import { createCurrentHostDaemonHolder } from '@/hostd/current-host-daemon'
|
|
6
6
|
import { startDaemon, type DaemonLogEvent, type RestartPreflight } from '@/hostd/daemon'
|
|
7
7
|
import { createKakaoRenewalManager } from '@/hostd/kakao-renewal-manager'
|
|
@@ -92,11 +92,12 @@ export type HostdRestartDeps = {
|
|
|
92
92
|
start: (opts: StartOptions) => Promise<StartResult>
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
+
const controller = resolveController()
|
|
95
96
|
const defaultRestartDeps: HostdRestartDeps = {
|
|
96
97
|
validateConfig,
|
|
97
|
-
stop,
|
|
98
|
+
stop: (opts) => controller.stop(opts),
|
|
98
99
|
loadConfigSync,
|
|
99
|
-
start,
|
|
100
|
+
start: (opts) => controller.start(opts),
|
|
100
101
|
}
|
|
101
102
|
|
|
102
103
|
export function buildHostdRestart(
|
package/src/cli/logs.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { defineCommand } from 'citty'
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { parseTailValue, resolveController } from '@/container'
|
|
4
4
|
|
|
5
5
|
import { preflightDocker, printDockerGuidance } from './docker-preflight'
|
|
6
6
|
import { runInspectViewer } from './inspect'
|
|
@@ -64,7 +64,7 @@ export const logsCommand = defineCommand({
|
|
|
64
64
|
console.log(c.dim('Showing container logs.'))
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
const result = await logs({ cwd, follow: args.follow, tail })
|
|
67
|
+
const result = await resolveController().logs({ cwd, follow: args.follow, tail })
|
|
68
68
|
if (!result.ok) {
|
|
69
69
|
console.error(errorLine(result.reason))
|
|
70
70
|
process.exit(1)
|