@pellux/goodvibes-agent 1.1.5 → 1.1.6

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Product-facing release notes for GoodVibes Agent.
 
+## 1.1.6 - 2026-06-05
+
+- Fixed Import GoodVibes settings so it also imports active and pending provider subscriptions from the GoodVibes TUI user store into Agent-owned subscription state.
+- Preserved existing Agent-only subscriptions while merging imported provider sessions by provider id.
+- Updated onboarding copy and added regression coverage for subscription import.
+
 ## 1.1.5 - 2026-06-05
 
 - Replaced onboarding with the real Agent setup flow for subscription login, provider/model selection, settings persistence, channels, voice, local context, automation, and finish.

package/dist/package/main.js

@@ -450372,6 +450372,23 @@ function createSchema2(db) {
   `);
   db.run(`CREATE INDEX IF NOT EXISTS idx_knowledge_schedules_job_id ON knowledge_schedules(job_id)`);
 }
+function getKnowledgeSchemaStatements() {
+  const statements = [];
+  createSchema2({
+    run(sql) {
+      const normalized = sql.trim();
+      if (normalized.length > 0)
+        statements.push(normalized);
+    }
+  });
+  return statements;
+}
+function renderKnowledgeSchemaSql() {
+  return `${getKnowledgeSchemaStatements().map((statement) => statement.endsWith(";") ? statement : `${statement};`).join(`
+
+`)}
+`;
+}
 function rowObject(columns, values2) {
   return Object.fromEntries(columns.map((column, index) => [column, values2[index]]));
 }
@@ -763654,6 +763671,9 @@ var init_ingest = __esm(() => {
 // node_modules/@pellux/goodvibes-sdk/dist/platform/knowledge/browser-history/index.js
 var init_browser_history = __esm(() => {
   init_ingest();
+  init_discover();
+  init_readers();
+  init_paths2();
 });
 
 // node_modules/graphql/jsutils/devAssert.mjs
@@ -781293,6 +781313,7 @@ var init_semantic = __esm(() => {
   init_llm();
   init_gap_repair();
   init_service4();
+  init_self_improvement();
 });
 
 // node_modules/@pellux/goodvibes-sdk/dist/platform/knowledge/home-graph/helpers.js
@@ -785261,8 +785282,40 @@ var init_map_view = __esm(() => {
 });
 
 // node_modules/@pellux/goodvibes-sdk/dist/platform/knowledge/home-graph/types.js
-var HOME_GRAPH_CAPABILITIES;
+var HOME_GRAPH_NODE_KINDS, HOME_GRAPH_RELATIONS, HOME_GRAPH_CAPABILITIES;
 var init_types15 = __esm(() => {
+  HOME_GRAPH_NODE_KINDS = [
+    "ha_home",
+    "ha_entity",
+    "ha_device",
+    "ha_area",
+    "ha_automation",
+    "ha_script",
+    "ha_scene",
+    "ha_label",
+    "ha_integration",
+    "ha_room",
+    "ha_device_passport",
+    "ha_maintenance_item",
+    "ha_troubleshooting_case",
+    "ha_purchase",
+    "ha_network_node"
+  ];
+  HOME_GRAPH_RELATIONS = [
+    "controls",
+    "located_in",
+    "belongs_to_device",
+    "has_manual",
+    "has_receipt",
+    "has_warranty",
+    "has_issue",
+    "fixed_by",
+    "uses_battery",
+    "connected_via",
+    "part_of_network",
+    "mentioned_by",
+    "source_for"
+  ];
   HOME_GRAPH_CAPABILITIES = [
     "knowledge-space-isolation",
     "snapshot-sync",
@@ -786669,6 +786722,7 @@ var init_service5 = __esm(() => {
 var init_home_graph = __esm(() => {
   init_service5();
   init_extension();
+  init_types15();
 });
 
 // node_modules/@pellux/goodvibes-sdk/dist/platform/knowledge/store-refinement.js
@@ -788996,10 +789050,14 @@ var init_service6 = __esm(() => {
 var init_project_planning = __esm(() => {
   init_service6();
   init_helpers3();
+  init_readiness();
 });
 
 // node_modules/@pellux/goodvibes-sdk/dist/platform/knowledge/persistence.js
-var init_persistence = () => {};
+var init_persistence = __esm(() => {
+  init_store_schema();
+  init_store_load();
+});
 
 // node_modules/@pellux/goodvibes-sdk/dist/platform/knowledge/projections.js
 class KnowledgeProjectionService {
@@ -792507,21 +792565,21 @@ var init_service7 = __esm(() => {
 var exports_knowledge = {};
 __export(exports_knowledge, {
   withKnowledgeSpace: () => withKnowledgeSpace,
-  uniqKnowledgeValues: () => uniq3,
-  stabilizeKnowledgeText: () => stableText2,
-  runKnowledgeSemanticSelfImprovement: () => runKnowledgeSemanticSelfImprovement2,
+  uniqKnowledgeValues: () => uniq2,
+  stabilizeKnowledgeText: () => stableText,
+  runKnowledgeSemanticSelfImprovement: () => runKnowledgeSemanticSelfImprovement,
   resolveProjectPlanningSpace: () => resolveProjectPlanningSpace,
-  resolveKnowledgeDbPathFromControlPlaneDir: () => resolveKnowledgeDbPathFromControlPlaneDir2,
+  resolveKnowledgeDbPathFromControlPlaneDir: () => resolveKnowledgeDbPathFromControlPlaneDir,
   renderPacket: () => renderPacket,
   renderKnowledgeSchemaSql: () => renderKnowledgeSchemaSql,
   renderKnowledgeMap: () => renderKnowledgeMap,
   readKnowledgeSearchText: () => readKnowledgeSearchText,
-  readBrowserKnowledgeProfile: () => readBrowserKnowledgeProfile2,
+  readBrowserKnowledgeProfile: () => readBrowserKnowledgeProfile,
   projectPlanningSourceId: () => projectPlanningSourceId,
   projectPlanningProjectIdFromPath: () => projectPlanningProjectIdFromPath,
   projectPlanningCanonicalUri: () => projectPlanningCanonicalUri,
   projectKnowledgeSpaceId: () => projectKnowledgeSpaceId,
-  parseKnowledgeJsonValue: () => parseJsonValue2,
+  parseKnowledgeJsonValue: () => parseJsonValue,
   normalizeProjectId: () => normalizeProjectId,
   normalizeKnowledgeSpaceId: () => normalizeKnowledgeSpaceId,
   normalizeHomeAssistantInstallationId: () => normalizeHomeAssistantInstallationId,
@@ -792529,12 +792587,12 @@ __export(exports_knowledge, {
   materializeGeneratedKnowledgeProjection: () => materializeGeneratedKnowledgeProjection,
   looksLikeRawPdfPayload: () => looksLikeRawPdfPayload,
   looksBinaryLikeText: () => looksBinaryLikeText,
-  loadKnowledgeStoreSnapshot: () => loadKnowledgeStoreSnapshot2,
+  loadKnowledgeStoreSnapshot: () => loadKnowledgeStoreSnapshot,
   listGeneratedKnowledgePages: () => listGeneratedKnowledgePages,
-  listBrowserKinds: () => listBrowserKinds2,
+  listBrowserKinds: () => listBrowserKinds,
   knowledgeSpaceMetadata: () => knowledgeSpaceMetadata,
   knowledgePageSourceWeight: () => knowledgePageSourceWeight,
-  knowledgeNowMs: () => nowMs2,
+  knowledgeNowMs: () => nowMs,
   knowledgeExtractionNeedsRefresh: () => knowledgeExtractionNeedsRefresh,
   isUsefulKnowledgePageSourceCandidate: () => isUsefulKnowledgePageSourceCandidate,
   isUsefulKnowledgePageSource: () => isUsefulKnowledgePageSource,
@@ -792554,12 +792612,12 @@ __export(exports_knowledge, {
   generatedKnowledgeSourceId: () => generatedKnowledgeSourceId,
   generatedKnowledgeCanonicalUri: () => generatedKnowledgeCanonicalUri,
   extractKnowledgeArtifact: () => extractKnowledgeArtifact,
-  evaluateProjectPlanningReadiness: () => evaluateProjectPlanningReadiness2,
-  discoverBrowserKnowledgeProfiles: () => discoverBrowserKnowledgeProfiles2,
+  evaluateProjectPlanningReadiness: () => evaluateProjectPlanningReadiness,
+  discoverBrowserKnowledgeProfiles: () => discoverBrowserKnowledgeProfiles,
   createWebKnowledgeGapRepairer: () => createWebKnowledgeGapRepairer,
   createProviderBackedKnowledgeSemanticLlm: () => createProviderBackedKnowledgeSemanticLlm,
   createMemoryApi: () => createMemoryApi,
-  createKnowledgeSchema: () => createSchema3,
+  createKnowledgeSchema: () => createSchema2,
   createKnowledgeApi: () => createKnowledgeApi,
   createDefaultKnowledgeConnectorRegistry: () => createDefaultKnowledgeConnectorRegistry,
   compareKnowledgePageSources: () => compareKnowledgePageSources,
@@ -794998,7 +795056,7 @@ var init_delivery_manager = __esm(() => {
 });
 
 // node_modules/@pellux/goodvibes-sdk/dist/platform/automation/scheduler-capacity.js
-function computeSchedulerCapacity(slotsTotal, runs, nowMs3 = Date.now()) {
+function computeSchedulerCapacity(slotsTotal, runs, nowMs2 = Date.now()) {
   let slotsInUse = 0;
   const queuedRuns = [];
   for (const run7 of runs) {
@@ -795008,7 +795066,7 @@ function computeSchedulerCapacity(slotsTotal, runs, nowMs3 = Date.now()) {
       queuedRuns.push(run7);
   }
   const queueDepth = queuedRuns.length;
-  const oldestQueuedAgeMs = queueDepth > 0 ? nowMs3 - Math.min(...queuedRuns.map((r6) => r6.queuedAt)) : null;
+  const oldestQueuedAgeMs = queueDepth > 0 ? nowMs2 - Math.min(...queuedRuns.map((r6) => r6.queuedAt)) : null;
   return { slotsTotal, slotsInUse, queueDepth, oldestQueuedAgeMs };
 }
 
@@ -817034,7 +817092,7 @@ var createStyledCell = (char, overrides = {}) => ({
 // src/version.ts
 import { readFileSync } from "fs";
 import { join } from "path";
-var _version = "1.1.5";
+var _version = "1.1.6";
 try {
   const pkg = JSON.parse(readFileSync(join(import.meta.dir, "..", "package.json"), "utf-8"));
   _version = typeof pkg.version === "string" ? pkg.version : _version;
@@ -839547,7 +839605,7 @@ var WORK_PLAN_STATUSES = [
   "failed",
   "cancelled"
 ];
-function nowMs3() {
+function nowMs2() {
   return Date.now();
 }
 function isObject4(value) {
@@ -839653,7 +839711,7 @@ class WorkPlanStore {
     if (!normalizedTitle)
       throw new Error("Work plan item title is required.");
     const plan = this.readPlan();
-    const time4 = nowMs3();
+    const time4 = nowMs2();
     const item = {
       id: createItemId(),
       title: normalizedTitle,
@@ -839677,7 +839735,7 @@ class WorkPlanStore {
   updateItem(idOrPrefix, patch2) {
     const plan = this.readPlan();
     const item = this.resolveItem(plan, idOrPrefix);
-    const time4 = nowMs3();
+    const time4 = nowMs2();
     const nextStatus = patch2.status ?? item.status;
     const next = this.pruneItem({
       ...item,
@@ -839710,7 +839768,7 @@ class WorkPlanStore {
   removeItem(idOrPrefix) {
     const plan = this.readPlan();
     const item = this.resolveItem(plan, idOrPrefix);
-    const time4 = nowMs3();
+    const time4 = nowMs2();
     const remaining = plan.items.filter((candidate) => candidate.id !== item.id);
     this.writePlan({
       ...plan,
@@ -839730,7 +839788,7 @@ class WorkPlanStore {
       ...plan,
       items: remaining,
       activeItemId: remaining[0]?.id,
-      updatedAt: nowMs3()
+      updatedAt: nowMs2()
     });
     return removed;
   }
@@ -839769,7 +839827,7 @@ class WorkPlanStore {
     const parsed = JSON.parse(raw);
     if (!isObject4(parsed))
       return this.createEmptyPlan();
-    const time4 = nowMs3();
+    const time4 = nowMs2();
     const createdAt = typeof parsed.createdAt === "number" ? parsed.createdAt : time4;
     const updatedAt = typeof parsed.updatedAt === "number" ? parsed.updatedAt : createdAt;
     const items = Array.isArray(parsed.items) ? parsed.items.map((item) => normalizeItem(item, createdAt)).filter((item) => item !== null) : [];
@@ -839788,7 +839846,7 @@ class WorkPlanStore {
     };
   }
   createEmptyPlan() {
-    const time4 = nowMs3();
+    const time4 = nowMs2();
     return {
       id: createPlanId(this.options.projectId, this.options.projectRoot),
       projectId: this.options.projectId,
@@ -890625,7 +890683,7 @@ var AGENT_WORKSPACE_CATEGORIES = [
     summary: "Import preferences, sign in, and choose the main model.",
     detail: "Start here on a fresh install. Every row either saves state, opens the shared model picker, or opens a confirmed in-modal form.",
     actions: [
-      { id: "import-goodvibes-tui-settings", label: "Import GoodVibes settings", detail: "Copy existing display, provider, behavior, permission, TTS, channel, helper, tool, release, and automation values into Agent-owned settings.", kind: "settings-import", safety: "safe" },
+      { id: "import-goodvibes-tui-settings", label: "Import GoodVibes settings", detail: "Copy existing display, provider, subscription, behavior, permission, TTS, channel, helper, tool, release, and automation values into Agent-owned state.", kind: "settings-import", safety: "safe" },
       { id: "subscription-login-start", label: "Start subscription login", detail: "Start one provider sign-in flow, save pending state, and return here.", editorKind: "subscription-login-start", kind: "editor", safety: "safe" },
       { id: "subscription-login-finish", label: "Finish subscription login", detail: "Exchange a code or redirect URL and save the provider subscription session.", editorKind: "subscription-login-finish", kind: "editor", safety: "safe" },
       { id: "setup-provider-model", label: "Choose main model", detail: "Open the shared provider/model picker for normal assistant turns.", kind: "model-picker", modelPickerFlow: "providerModel", modelPickerTarget: "main", safety: "safe" },
@@ -896068,6 +896126,62 @@ function canImportTuiSetting(key) {
 function valuesMatch(left, right) {
   return JSON.stringify(left) === JSON.stringify(right);
 }
+function readRecordMap(record2, key) {
+  const value = record2[key];
+  return isRecord45(value) ? Object.values(value) : [];
+}
+function isProviderSubscription(value) {
+  return isRecord45(value) && typeof value.provider === "string" && typeof value.accessToken === "string" && typeof value.tokenType === "string" && value.authMode === "oauth" && typeof value.overrideAmbientApiKeys === "boolean" && typeof value.createdAt === "number" && typeof value.updatedAt === "number";
+}
+function isPendingSubscriptionLogin(value) {
+  return isRecord45(value) && typeof value.provider === "string" && typeof value.state === "string" && typeof value.verifier === "string" && typeof value.redirectUri === "string" && typeof value.createdAt === "number";
+}
+function importTuiSubscriptions(context, parseErrors) {
+  const shellPaths3 = context.workspace.shellPaths;
+  const manager5 = context.platform.subscriptionManager;
+  const result2 = {
+    importedActive: [],
+    importedPending: [],
+    unchangedActive: [],
+    unchangedPending: [],
+    skipped: []
+  };
+  if (!shellPaths3 || !manager5)
+    return result2;
+  const sourcePath = shellPaths3.resolveUserPath(GOODVIBES_TUI_SURFACE_ROOT, "subscriptions.json");
+  try {
+    const store2 = readJsonRecord(sourcePath);
+    if (!store2)
+      return result2;
+    for (const entry of readRecordMap(store2, "subscriptions")) {
+      if (!isProviderSubscription(entry)) {
+        result2.skipped.push("active subscription with invalid shape");
+        continue;
+      }
+      if (valuesMatch(manager5.get(entry.provider), entry)) {
+        result2.unchangedActive.push(entry.provider);
+        continue;
+      }
+      manager5.saveSubscription(entry);
+      result2.importedActive.push(entry.provider);
+    }
+    for (const entry of readRecordMap(store2, "pending")) {
+      if (!isPendingSubscriptionLogin(entry)) {
+        result2.skipped.push("pending subscription with invalid shape");
+        continue;
+      }
+      if (valuesMatch(manager5.getPending(entry.provider), entry)) {
+        result2.unchangedPending.push(entry.provider);
+        continue;
+      }
+      manager5.savePending(entry);
+      result2.importedPending.push(entry.provider);
+    }
+  } catch (error53) {
+    parseErrors.push(`subscriptions: ${error53 instanceof Error ? error53.message : String(error53)}`);
+  }
+  return result2;
+}
 function agentWorkspaceSettingSchema(context, key) {
   return context?.platform?.configManager?.getSchema().find((setting) => setting.key === key) ?? null;
 }
@@ -896171,7 +896285,7 @@ async function applyAgentWorkspaceSettingValue(context, setting, value) {
 async function importAgentWorkspaceTuiSettings(context) {
   const shellPaths3 = context?.workspace?.shellPaths;
   const configManager = context?.platform?.configManager;
-  if (!shellPaths3 || !configManager) {
+  if (!context || !shellPaths3 || !configManager) {
     return {
       status: "GoodVibes TUI settings import is unavailable in this runtime.",
       runtimeSnapshot: null,
@@ -896205,8 +896319,11 @@ async function importAgentWorkspaceTuiSettings(context) {
       parseErrors.push(`${source.label}: ${error53 instanceof Error ? error53.message : String(error53)}`);
     }
   }
-  if (values2.size === 0) {
-    const detail = parseErrors.length > 0 ? `No importable settings found. ${parseErrors.join("; ")}` : "No GoodVibes TUI settings file with importable Agent-owned settings was found.";
+  const subscriptions = importTuiSubscriptions(context, parseErrors);
+  const subscriptionImports = subscriptions.importedActive.length + subscriptions.importedPending.length;
+  const subscriptionUnchanged = subscriptions.unchangedActive.length + subscriptions.unchangedPending.length;
+  if (values2.size === 0 && subscriptionImports === 0 && subscriptionUnchanged === 0 && subscriptions.skipped.length === 0) {
+    const detail = parseErrors.length > 0 ? `No importable settings or subscriptions found. ${parseErrors.join("; ")}` : "No GoodVibes TUI settings or subscription store with importable Agent-owned state was found.";
     return {
       status: "No GoodVibes TUI settings imported.",
       runtimeSnapshot: null,
@@ -896236,15 +896353,20 @@ async function importAgentWorkspaceTuiSettings(context) {
       skipped.push(`${setting.key}: ${error53 instanceof Error ? error53.message : String(error53)}`);
     }
   }
+  skipped.push(...subscriptions.skipped);
+  const changedCount = imported.length + subscriptionImports;
+  const unchangedCount = unchanged.length + subscriptionUnchanged;
   return {
-    status: imported.length > 0 ? `Imported ${imported.length} GoodVibes TUI setting(s).` : "No GoodVibes TUI settings changed.",
+    status: changedCount > 0 ? `Imported ${changedCount} GoodVibes TUI item(s).` : "No GoodVibes TUI settings changed.",
     runtimeSnapshot: context ? buildAgentWorkspaceRuntimeSnapshot(context) : null,
     result: {
-      kind: skipped.length > 0 && imported.length === 0 ? "error" : imported.length > 0 ? "refreshed" : "guidance",
-      title: imported.length > 0 ? "GoodVibes TUI settings imported" : "No settings changed",
+      kind: skipped.length > 0 && changedCount === 0 ? "error" : changedCount > 0 ? "refreshed" : "guidance",
+      title: changedCount > 0 ? "GoodVibes TUI settings imported" : "No settings changed",
       detail: [
         imported.length > 0 ? `Imported: ${imported.slice(0, 10).join(", ")}${imported.length > 10 ? `, +${imported.length - 10} more` : ""}.` : "",
-        unchanged.length > 0 ? `${unchanged.length} setting(s) already matched.` : "",
+        subscriptions.importedActive.length > 0 ? `Imported active subscription(s): ${subscriptions.importedActive.join(", ")}.` : "",
+        subscriptions.importedPending.length > 0 ? `Imported pending subscription(s): ${subscriptions.importedPending.join(", ")}.` : "",
+        unchangedCount > 0 ? `${unchangedCount} item(s) already matched.` : "",
         skipped.length > 0 ? `Skipped: ${skipped.slice(0, 5).join("; ")}${skipped.length > 5 ? `; +${skipped.length - 5} more` : ""}.` : "",
         parseErrors.length > 0 ? `Parse issues: ${parseErrors.join("; ")}.` : ""
       ].filter((line2) => line2.length > 0).join(" "),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pellux/goodvibes-agent",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "private": false,
   "description": "GoodVibes personal operator assistant TUI with a proactive Agent product brain, isolated Agent Knowledge, local profiles, routines, skills, personas, and explicit build delegation.",
   "type": "module",

package/src/input/agent-workspace-categories.ts

@@ -43,7 +43,7 @@ export const AGENT_WORKSPACE_CATEGORIES: readonly AgentWorkspaceCategory[] = [
     summary: 'Import preferences, sign in, and choose the main model.',
     detail: 'Start here on a fresh install. Every row either saves state, opens the shared model picker, or opens a confirmed in-modal form.',
     actions: [
-      { id: 'import-goodvibes-tui-settings', label: 'Import GoodVibes settings', detail: 'Copy existing display, provider, behavior, permission, TTS, channel, helper, tool, release, and automation values into Agent-owned settings.', kind: 'settings-import', safety: 'safe' },
+      { id: 'import-goodvibes-tui-settings', label: 'Import GoodVibes settings', detail: 'Copy existing display, provider, subscription, behavior, permission, TTS, channel, helper, tool, release, and automation values into Agent-owned state.', kind: 'settings-import', safety: 'safe' },
       { id: 'subscription-login-start', label: 'Start subscription login', detail: 'Start one provider sign-in flow, save pending state, and return here.', editorKind: 'subscription-login-start', kind: 'editor', safety: 'safe' },
       { id: 'subscription-login-finish', label: 'Finish subscription login', detail: 'Exchange a code or redirect URL and save the provider subscription session.', editorKind: 'subscription-login-finish', kind: 'editor', safety: 'safe' },
       { id: 'setup-provider-model', label: 'Choose main model', detail: 'Open the shared provider/model picker for normal assistant turns.', kind: 'model-picker', modelPickerFlow: 'providerModel', modelPickerTarget: 'main', safety: 'safe' },

package/src/input/agent-workspace-settings.ts

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
 import type { ConfigKey, ConfigSetting } from '@pellux/goodvibes-sdk/platform/config';
+import type { PendingSubscriptionLogin, ProviderSubscription } from '@pellux/goodvibes-sdk/platform/config';
 import { setHarnessSetting } from '../agent/harness-control.ts';
 import { isExternalHostOwnedSettingKey } from '../config/agent-settings-policy.ts';
 import { buildAgentWorkspaceRuntimeSnapshot } from './agent-workspace-snapshot.ts';
@@ -83,6 +84,83 @@ function valuesMatch(left: unknown, right: unknown): boolean {
   return JSON.stringify(left) === JSON.stringify(right);
 }
 
+function readRecordMap(record: Record<string, unknown>, key: string): readonly unknown[] {
+  const value = record[key];
+  return isRecord(value) ? Object.values(value) : [];
+}
+
+function isProviderSubscription(value: unknown): value is ProviderSubscription {
+  return isRecord(value)
+    && typeof value.provider === 'string'
+    && typeof value.accessToken === 'string'
+    && typeof value.tokenType === 'string'
+    && value.authMode === 'oauth'
+    && typeof value.overrideAmbientApiKeys === 'boolean'
+    && typeof value.createdAt === 'number'
+    && typeof value.updatedAt === 'number';
+}
+
+function isPendingSubscriptionLogin(value: unknown): value is PendingSubscriptionLogin {
+  return isRecord(value)
+    && typeof value.provider === 'string'
+    && typeof value.state === 'string'
+    && typeof value.verifier === 'string'
+    && typeof value.redirectUri === 'string'
+    && typeof value.createdAt === 'number';
+}
+
+function importTuiSubscriptions(context: CommandContext, parseErrors: string[]): {
+  readonly importedActive: string[];
+  readonly importedPending: string[];
+  readonly unchangedActive: string[];
+  readonly unchangedPending: string[];
+  readonly skipped: string[];
+} {
+  const shellPaths = context.workspace.shellPaths;
+  const manager = context.platform.subscriptionManager;
+  const result = {
+    importedActive: [] as string[],
+    importedPending: [] as string[],
+    unchangedActive: [] as string[],
+    unchangedPending: [] as string[],
+    skipped: [] as string[],
+  };
+  if (!shellPaths || !manager) return result;
+
+  const sourcePath = shellPaths.resolveUserPath(GOODVIBES_TUI_SURFACE_ROOT, 'subscriptions.json');
+  try {
+    const store = readJsonRecord(sourcePath);
+    if (!store) return result;
+    for (const entry of readRecordMap(store, 'subscriptions')) {
+      if (!isProviderSubscription(entry)) {
+        result.skipped.push('active subscription with invalid shape');
+        continue;
+      }
+      if (valuesMatch(manager.get(entry.provider), entry)) {
+        result.unchangedActive.push(entry.provider);
+        continue;
+      }
+      manager.saveSubscription(entry);
+      result.importedActive.push(entry.provider);
+    }
+    for (const entry of readRecordMap(store, 'pending')) {
+      if (!isPendingSubscriptionLogin(entry)) {
+        result.skipped.push('pending subscription with invalid shape');
+        continue;
+      }
+      if (valuesMatch(manager.getPending(entry.provider), entry)) {
+        result.unchangedPending.push(entry.provider);
+        continue;
+      }
+      manager.savePending(entry);
+      result.importedPending.push(entry.provider);
+    }
+  } catch (error) {
+    parseErrors.push(`subscriptions: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  return result;
+}
+
 export function agentWorkspaceSettingSchema(context: CommandContext | null, key: string): ConfigSetting | null {
   return context?.platform?.configManager
     ?.getSchema()
@@ -200,7 +278,7 @@ export async function applyAgentWorkspaceSettingValue(
 export async function importAgentWorkspaceTuiSettings(context: CommandContext | null): Promise<TuiSettingsImportOutcome> {
   const shellPaths = context?.workspace?.shellPaths;
   const configManager = context?.platform?.configManager;
-  if (!shellPaths || !configManager) {
+  if (!context || !shellPaths || !configManager) {
     return {
       status: 'GoodVibes TUI settings import is unavailable in this runtime.',
       runtimeSnapshot: null,
@@ -232,11 +310,14 @@ export async function importAgentWorkspaceTuiSettings(context: CommandContext |
       parseErrors.push(`${source.label}: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
+  const subscriptions = importTuiSubscriptions(context, parseErrors);
+  const subscriptionImports = subscriptions.importedActive.length + subscriptions.importedPending.length;
+  const subscriptionUnchanged = subscriptions.unchangedActive.length + subscriptions.unchangedPending.length;
 
-  if (values.size === 0) {
+  if (values.size === 0 && subscriptionImports === 0 && subscriptionUnchanged === 0 && subscriptions.skipped.length === 0) {
     const detail = parseErrors.length > 0
-      ? `No importable settings found. ${parseErrors.join('; ')}`
-      : 'No GoodVibes TUI settings file with importable Agent-owned settings was found.';
+      ? `No importable settings or subscriptions found. ${parseErrors.join('; ')}`
+      : 'No GoodVibes TUI settings or subscription store with importable Agent-owned state was found.';
     return {
       status: 'No GoodVibes TUI settings imported.',
       runtimeSnapshot: null,
@@ -266,16 +347,21 @@ export async function importAgentWorkspaceTuiSettings(context: CommandContext |
       skipped.push(`${setting.key}: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
+  skipped.push(...subscriptions.skipped);
+  const changedCount = imported.length + subscriptionImports;
+  const unchangedCount = unchanged.length + subscriptionUnchanged;
 
   return {
-    status: imported.length > 0 ? `Imported ${imported.length} GoodVibes TUI setting(s).` : 'No GoodVibes TUI settings changed.',
+    status: changedCount > 0 ? `Imported ${changedCount} GoodVibes TUI item(s).` : 'No GoodVibes TUI settings changed.',
     runtimeSnapshot: context ? buildAgentWorkspaceRuntimeSnapshot(context) : null,
     result: {
-      kind: skipped.length > 0 && imported.length === 0 ? 'error' : imported.length > 0 ? 'refreshed' : 'guidance',
-      title: imported.length > 0 ? 'GoodVibes TUI settings imported' : 'No settings changed',
+      kind: skipped.length > 0 && changedCount === 0 ? 'error' : changedCount > 0 ? 'refreshed' : 'guidance',
+      title: changedCount > 0 ? 'GoodVibes TUI settings imported' : 'No settings changed',
       detail: [
         imported.length > 0 ? `Imported: ${imported.slice(0, 10).join(', ')}${imported.length > 10 ? `, +${imported.length - 10} more` : ''}.` : '',
-        unchanged.length > 0 ? `${unchanged.length} setting(s) already matched.` : '',
+        subscriptions.importedActive.length > 0 ? `Imported active subscription(s): ${subscriptions.importedActive.join(', ')}.` : '',
+        subscriptions.importedPending.length > 0 ? `Imported pending subscription(s): ${subscriptions.importedPending.join(', ')}.` : '',
+        unchangedCount > 0 ? `${unchangedCount} item(s) already matched.` : '',
         skipped.length > 0 ? `Skipped: ${skipped.slice(0, 5).join('; ')}${skipped.length > 5 ? `; +${skipped.length - 5} more` : ''}.` : '',
         parseErrors.length > 0 ? `Parse issues: ${parseErrors.join('; ')}.` : '',
       ].filter((line) => line.length > 0).join(' '),

package/src/version.ts

@@ -6,7 +6,7 @@ import { join } from 'node:path';
 // The prebuild script updates the fallback value before compilation.
 // Uses import.meta.dir (Bun) to locate package.json relative to this file,
 // which is correct regardless of the process working directory.
-let _version = '1.1.5';
+let _version = '1.1.6';
 try {
   const pkg = JSON.parse(readFileSync(join(import.meta.dir, '..', 'package.json'), 'utf-8')) as {
     readonly version?: unknown;