@astrale-os/cli 0.6.3-alpha.0 → 0.8.0-alpha.0

package/studio/shared/agent-effort.ts

@@ -0,0 +1,15 @@
+import type { AgentEffort } from './types'
+
+/** Map a persisted cross-harness effort onto the selected harness's vocabulary. */
+export function effectiveAgentEffort(
+  levels: readonly AgentEffort[],
+  requested?: string,
+): AgentEffort | undefined {
+  if (!requested) return undefined
+  if (levels.includes(requested as AgentEffort)) return requested as AgentEffort
+  if (requested === 'max' && levels.includes('xhigh')) return 'xhigh'
+  if (requested === 'ultracode' && levels.includes('xhigh')) return 'xhigh'
+  if (requested === 'minimal' && levels.includes('low')) return 'low'
+  if (levels.includes('high')) return 'high'
+  return levels[0]
+}

package/studio/shared/agent-models.test.ts

@@ -0,0 +1,9 @@
+import { expect, test } from 'bun:test'
+
+import { updateAgentModel } from './agent-models'
+
+test('switching model overrides preserves independent harness selections', () => {
+  const selected = updateAgentModel({ claude: 'opus' }, 'Codex', ' gpt-5.4-mini ')
+  expect(selected).toEqual({ claude: 'opus', codex: 'gpt-5.4-mini' })
+  expect(updateAgentModel(selected, 'claude', '')).toEqual({ codex: 'gpt-5.4-mini' })
+})

package/studio/shared/agent-models.ts

@@ -0,0 +1,14 @@
+/** Update one harness-specific model override without disturbing sibling harnesses. */
+export function updateAgentModel(
+  current: Record<string, string>,
+  harness: string,
+  model: string,
+): Record<string, string> {
+  const key = harness.trim().toLowerCase()
+  if (!key) return current
+  const next = { ...current }
+  const normalized = model.trim()
+  if (normalized) next[key] = normalized
+  else delete next[key]
+  return next
+}

package/studio/shared/settings-values.test.ts

@@ -0,0 +1,18 @@
+import { expect, test } from 'bun:test'
+
+import { parseStudioNumericSetting } from './settings-values'
+
+test('accepts bounded integer Studio timing settings', () => {
+  expect(parseStudioNumericSetting('instancePollMs', '1000')).toBe(1000)
+  expect(parseStudioNumericSetting('instancePollMs', 3_600_000)).toBe(3_600_000)
+})
+
+test('rejects blank, fractional, non-finite, and out-of-range Studio timing settings', () => {
+  expect(parseStudioNumericSetting('instancePollMs', '')).toBeNull()
+  expect(parseStudioNumericSetting('instancePollMs', 999)).toBeNull()
+  expect(parseStudioNumericSetting('instancePollMs', 1_000.5)).toBeNull()
+  expect(parseStudioNumericSetting('instancePollMs', Number.POSITIVE_INFINITY)).toBeNull()
+  expect(parseStudioNumericSetting('instancePollMs', 3_600_001)).toBeNull()
+  expect(parseStudioNumericSetting('instancePollMs', [1_000])).toBeNull()
+  expect(parseStudioNumericSetting('instancePollMs', { valueOf: () => 1_000 })).toBeNull()
+})

package/studio/shared/settings-values.ts

@@ -0,0 +1,20 @@
+export const STUDIO_NUMERIC_LIMITS = {
+  introspectTimeoutMs: { min: 250, max: 300_000 },
+  instancePollMs: { min: 1_000, max: 3_600_000 },
+  updatesPollMs: { min: 10_000, max: 86_400_000 },
+  viewProbeTimeoutMs: { min: 250, max: 120_000 },
+} as const
+
+export type NumericStudioSetting = keyof typeof STUDIO_NUMERIC_LIMITS
+
+/** Parse one user/disk numeric setting without permitting destructive intervals. */
+export function parseStudioNumericSetting(
+  key: NumericStudioSetting,
+  value: unknown,
+): number | null {
+  if (typeof value !== 'number' && typeof value !== 'string') return null
+  if (typeof value === 'string' && !value.trim()) return null
+  const parsed = typeof value === 'number' ? value : Number(value)
+  const { min, max } = STUDIO_NUMERIC_LIMITS[key]
+  return Number.isInteger(parsed) && parsed >= min && parsed <= max ? parsed : null
+}

package/studio/shared/types.ts

@@ -605,8 +605,18 @@ export interface AgentEvent {
   commentId?: string
 }
 
-export const AGENT_EFFORT_LEVELS = ['low', 'medium', 'high', 'xhigh', 'max', 'ultracode'] as const
+export const AGENT_EFFORT_LEVELS = [
+  'minimal',
+  'low',
+  'medium',
+  'high',
+  'xhigh',
+  'max',
+  'ultracode',
+] as const
 export type AgentEffort = (typeof AGENT_EFFORT_LEVELS)[number]
+export const AGENT_ACCESS_LEVELS = ['workspace', 'full'] as const
+export type AgentAccess = (typeof AGENT_ACCESS_LEVELS)[number]
 
 export interface AgentPromptSnapshot {
   createdAt: string
@@ -619,8 +629,12 @@ export interface AgentPromptSnapshot {
   /** true when this turn used a prior harness session id */
   resumed: boolean
   sessionId?: string
-  /** Claude Code --effort value used for this turn. */
+  /** Explicit Studio model override used for this turn; absent means harness-native default. */
+  model?: string
+  /** Harness-native reasoning effort used for this turn. */
   effort?: AgentEffort
+  /** Filesystem/network authority granted to the harness for this turn. */
+  access?: AgentAccess
   /** generated MCP bridge tools exposed to the harness for live write-back */
   mcpTools: string[]
 }
@@ -659,7 +673,7 @@ export interface AgentRun {
   events: AgentEvent[]
   costUsd?: number
   numTurns?: number
-  /** total tokens processed this turn (input + output + cache) */
+  /** total token usage reported by the harness for this turn */
   tokens?: number
   error?: string
   /** how many threads the agent answered live via the bridge tools this turn */
@@ -670,8 +684,8 @@ export interface AgentRun {
   prompt?: AgentPromptSnapshot
 }
 
-/** The ongoing, resumable conversation for a domain — one continuous Claude Code
- *  session threaded across submits. Survives studio restarts (persisted on disk). */
+/** The ongoing, resumable conversation for a domain and selected harness.
+ *  Survives studio restarts (persisted on disk). */
 export interface ConversationInfo {
   /** a resumable session exists → the next submit continues it (vs. starting fresh) */
   active: boolean
@@ -688,7 +702,18 @@ export interface AgentSessionInfo {
   harness?: string
 }
 
-/** Whether the selected agent harness (e.g. Claude Code) is installed & invokable. */
+export interface HarnessCapabilities {
+  effortLevels: readonly AgentEffort[]
+  accessLevels: readonly AgentAccess[]
+  /** Stable aliases advertised even when the harness has no catalog API. */
+  modelOptions?: readonly HarnessModelOption[]
+  ask: boolean
+  loadout: boolean
+  /** Custom model-gateway wire contract this harness can consume in Studio. */
+  gateway: 'anthropic' | 'responses' | 'none'
+}
+
+/** Whether the selected agent harness is installed, invokable, and configurable. */
 export interface HarnessStatus {
   id: string
   label: string
@@ -700,6 +725,10 @@ export interface HarnessStatus {
   message: string
   /** known harnesses for the selector (locked to one for now) */
   options: { id: string; label: string }[]
+  /** an environment/CLI override owns the selection, so the GUI cannot change it */
+  locked: boolean
+  source: 'environment' | 'domain' | 'default'
+  capabilities: HarnessCapabilities
 }
 
 /** One MCP server the harness loaded, with its live connection status. */
@@ -736,7 +765,13 @@ export interface HarnessLoadout {
   ok: boolean
   /** reason when !ok (binary missing / probe timed out / no init event) */
   detail?: string
+  /** Model the harness resolves before Studio applies its optional override. */
+  nativeModel?: string
   model?: string
+  /** Where the effective model came from. */
+  modelSource?: 'studio' | 'config' | 'default' | 'runtime'
+  /** Models the harness currently advertises for easy selection. */
+  models?: HarnessModelOption[]
   permissionMode?: string
   /** how the harness is authed: 'none' | 'ANTHROPIC_API_KEY' | … */
   apiKeySource?: string
@@ -752,6 +787,18 @@ export interface HarnessLoadout {
   builtinCommandCount: number
   /** epoch ms when probed */
   probedAt: number
+  /** Claude exposes a live init event; Codex exposes configured/installed state. */
+  source?: 'runtime' | 'configured'
+}
+
+export interface HarnessModelOption {
+  /** Stable model slug passed to the harness, e.g. `gpt-5.6-sol`. */
+  id: string
+  /** Human-friendly catalog label. */
+  label: string
+  description?: string
+  /** The harness catalog's built-in default when no config layer overrides it. */
+  isDefault?: boolean
 }
 
 /** Domain-attributable agent spend — accumulated from this studio's own runs on
@@ -837,8 +884,12 @@ export type TypeDescriptor =
 /** Per-domain overrides for values the studio otherwise hard-codes. Stored at
  *  `.domain-studio/settings.json`; missing keys fall back to defaults. */
 export interface StudioSettings {
-  /** Claude Code reasoning effort passed as --effort (default 'high') */
+  /** Harness-native reasoning effort (default 'high') */
   agentEffort: AgentEffort
+  /** workspace = sandboxed edits; full = unrestricted local automation */
+  agentAccess: AgentAccess
+  /** Optional model override, independently remembered for each harness id. */
+  agentModels: Record<string, string>
   /** folder under the domain root scanned for integrations (default 'integrations') */
   integrationsDir: string
   /** schema/core extraction subprocess timeout in ms (default 20000) */

package/src/connect-core.test.ts

@@ -1,42 +0,0 @@
-import { describe, expect, test } from 'bun:test'
-
-import * as C from './connect-core'
-
-// Guards the frozen export surface `@astrale-os/connect-host` borrows. If a
-// re-export name drifts (renamed / dropped upstream), this smoke fails loudly
-// instead of the connect-host adapter breaking at type-check time in another
-// submodule.
-describe('connect-core barrel', () => {
-  test('re-exports every borrowed function', () => {
-    expect(C.readIdentities).toBeTypeOf('function')
-    expect(C.getDefault).toBeTypeOf('function')
-    expect(C.getIdentity).toBeTypeOf('function')
-    expect(C.signAs).toBeTypeOf('function')
-    expect(C.listIdentityKeys).toBeTypeOf('function')
-    expect(C.readInstances).toBeTypeOf('function')
-    expect(C.resetInstancesMemo).toBeTypeOf('function')
-    expect(C.resolveInstance).toBeTypeOf('function')
-    expect(C.normalizeInstanceKernelUrl).toBeTypeOf('function')
-    expect(C.orgIdForAudience).toBeTypeOf('function')
-    expect(C.resolveInstanceTarget).toBeTypeOf('function')
-    expect(C.readConfig).toBeTypeOf('function')
-    expect(C.resolveCredential).toBeTypeOf('function')
-    expect(C.fetchWithCaFile).toBeTypeOf('function')
-    expect(C.createPaths).toBeTypeOf('function')
-    expect(C.loginViaIdp).toBeTypeOf('function')
-    expect(C.resolveIdpName).toBeTypeOf('function')
-    expect(C.readIdpSession).toBeTypeOf('function')
-    expect(C.isSessionExpired).toBeTypeOf('function')
-  })
-
-  test('re-exports the error classes', () => {
-    expect(C.AuthError).toBeTypeOf('function')
-    expect(C.IdpRefreshTransientError).toBeTypeOf('function')
-    expect(C.IdpOrgMembershipError).toBeTypeOf('function')
-  })
-
-  test('re-exports the paths singleton', () => {
-    expect(C.paths).toBeTypeOf('object')
-    expect(C.paths.home).toBeTypeOf('string')
-  })
-})

package/src/connect-core.ts

@@ -1,53 +0,0 @@
-/**
- * connect-core — the frozen, curated re-export surface the connect-host adapter
- * borrows from the CLI. It is the ONE public seam between `@astrale-os/cli` and
- * `@astrale-os/connect-host`; nothing else in cli/src is contract.
- *
- * Consumed by `@astrale-os/connect-host`; temps-2 seed of a future
- * `@astrale-os/client-core`. Re-export ONLY — no logic lives here.
- */
-
-// ── identity registry (~/.astrale/identities.json) ──────────────────────────
-export { readIdentities, getDefault, getIdentity } from './lib/identity'
-export type { Identity, IdentityStore } from './lib/identity'
-
-// ── keypairs on disk + self-grant mint ──────────────────────────────────────
-export { signAs, listIdentityKeys } from './lib/keys'
-
-// ── instance bookmarks (~/.astrale/instances.json) ──────────────────────────
-export {
-  readInstances,
-  resetInstancesMemo,
-  resolveInstance,
-  normalizeInstanceKernelUrl,
-  orgIdForAudience,
-} from './lib/instance'
-export type { InstanceEntry, InstanceStore, ResolvedInstance } from './lib/instance'
-
-// ── instance-target resolution (bookmark | managed | admin | free url) ──────
-export { resolveInstanceTarget } from './lib/instance-target'
-export type { ResolvedInstanceTarget } from './lib/instance-target'
-
-// ── global config (~/.astrale/config.json) ──────────────────────────────────
-export { readConfig } from './lib/config'
-export type { AstraleConfig } from './lib/config'
-
-// ── credential resolution (self-grant + IdP) ────────────────────────────────
-export { resolveCredential, IdpRefreshTransientError, IdpOrgMembershipError } from './kernel/auth'
-
-// ── IdP login (device flow) — driven by connect-host's `auth.login` op ───────
-export { loginViaIdp, resolveIdpName } from './lib/login-flow'
-export type { LoginFlowOpts, LoginResult, DeviceVerification } from './lib/login-flow'
-
-// ── IdP session state (so connect-host can flag "login required" rows) ───────
-export { readIdpSession, isSessionExpired } from './lib/idp'
-export type { IdpSession } from './lib/idp'
-
-// ── typed errors ────────────────────────────────────────────────────────────
-export { AuthError } from './errors'
-
-// ── custom-CA fetch (private-CA local stacks) ───────────────────────────────
-export { fetchWithCaFile } from './kernel/ca-fetch'
-
-// ── path resolution (~/.astrale layout) ─────────────────────────────────────
-export { paths, createPaths } from './lib/env'