factory-ai 1.6.1 → 2.1.0

package/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes follow semantic versioning and the Keep a Changelog structur
 
 ## [Unreleased]
 
+## [2.1.0] - 2026-07-13
+
+### Changed
+
+- Redesigned the native TUI around a persistent workspace selector with workspace-scoped Dashboard, Objectives, and Agents pages.
+- Consolidated secrets, logs, models, runtime, and capabilities under Settings.
+- Added dedicated bounded command-console and always-visible command-line panes with scrollback, clear controls, history, inline errors, and selected-workspace submit shortcuts.
+
+## [2.0.0] - 2026-07-13
+
+### Changed
+
+- Replaced the JavaScript fallback TUI with one native Go operator console featuring an OpenCode-style command bar, command history, inline output/errors, and shortcuts for submissions, workspace imports, secrets, approvals, pause/resume, and help.
+- Removed the `factory-ui` JavaScript binary and `neo-blessed` dependency; `factory ui` now fails closed if its verified attested native binary is unavailable.
+
 ## [1.6.1] - 2026-07-13
 
 ### Added
@@ -14,7 +29,7 @@ All notable changes follow semantic versioning and the Keep a Changelog structur
 
 ### Added
 
-- Persistent Conductor-style workspace catalog with local/GitHub imports, managed clones, stable names, default branches, project initialization, CLI commands, direct Service Bus submission, and workspace views in both TUIs.
+- Persistent Conductor-style workspace catalog with local/GitHub imports, managed clones, stable names, default branches, project initialization, CLI commands, direct Service Bus submission, and a native workspace view.
 
 ## [1.5.3] - 2026-07-13
 
@@ -38,7 +53,7 @@ All notable changes follow semantic versioning and the Keep a Changelog structur
 
 ### Added
 
-- Cross-platform Bubble Tea/Lip Gloss operator client with direct Azure Blob snapshots, verified release binaries, scrolling, and safe Node action fallback.
+- Cross-platform Bubble Tea/Lip Gloss operator client with direct Azure Blob snapshots, verified release binaries, scrolling, and native command execution.
 - Automatic Azure and Bedrock context compaction with immutable objective retention and recent tool evidence.
 - Hierarchical `AGENTS.md` discovery, preconfigured project instructions, and bounded `.agent-factory` context.
 - Durable worktree crash recovery, parallel read-only tool batches, live activity timelines, retry/error telemetry, and stale-agent watchdog recovery.

package/README.md

@@ -96,6 +96,8 @@ factory ui
 | `factory secret set NAME` | Store a credential in global Key Vault |
 | `factory github connect ORG` | Connect GitHub Enterprise credentials |
 
+Inside `factory ui`, select a workspace from the persistent left sidebar with `[`/`]`; Dashboard, Objectives, and Agents are scoped to it. Settings contains secrets, logs, models, runtime, and capabilities. Press `:` or Enter to focus the dedicated command line and enter any Factory command without the `factory` prefix. Use `↑/↓` for command history and `Ctrl+↑/↓` for console scrollback. Shortcuts: `n` submit to the selected workspace, `i` import, `a` set secret, `y/x` approve or deny, `p/u` pause or resume, `?` help, `Ctrl+L` clear console, and `q` quit.
+
 ## Architecture
 
 ```mermaid

package/bin/factory

@@ -31,6 +31,7 @@ usage() {
     '  workspace list | import PATH|OWNER/REPO [--name NAME] | show NAME | remove NAME' \
     '  submit <workspace|owner/repo> <objective>' \
     '  update check | now | status | enable | disable' \
+    '  approval approve | deny OBJECTIVE_ID APPROVAL_ID REASON' \
     '  issue <owner/repo> <number>' \
     '  ui' \
     '  init <local-project-path>' \
@@ -114,6 +115,9 @@ case "$command" in
       *) printf 'Usage: factory update check | now | status | enable | disable\n' >&2; exit 2 ;;
     esac
     ;;
+  approval)
+    SERVICE_BUS_NAMESPACE="$NAMESPACE" CONTROL_QUEUE=control-events exec node "$FACTORY_ROOT/src/approval-cli.js" "$@"
+    ;;
   acp)
     request=${1:?ACP request JSON file required}
     SERVICE_BUS_NAMESPACE="$NAMESPACE" CONTROL_QUEUE=control-events FACTORY_ACP_ENABLED=true exec node "$FACTORY_ROOT/src/acp-cli.js" "$request"
@@ -236,8 +240,8 @@ case "$command" in
     if [[ -x $binary ]]; then
       FACTORY_STORAGE_ACCOUNT="$STORAGE" FACTORY_NAME="$FACTORY_NAME" FACTORY_PURPOSE="$FACTORY_PURPOSE" exec "$binary"
     fi
-    printf 'Charm client unavailable for this release; using Node fallback.\n' >&2
-    FACTORY_RESOURCE_GROUP="$RESOURCE_GROUP" FACTORY_VM="$VM" FACTORY_SERVICE_BUS="$NAMESPACE" FACTORY_KEY_VAULT="$VAULT" FACTORY_STORAGE_ACCOUNT="$STORAGE" FACTORY_NAME="$FACTORY_NAME" FACTORY_PURPOSE="$FACTORY_PURPOSE" node "$FACTORY_ROOT/src/tui.js"
+    printf 'Verified Factory TUI binary is unavailable for %s/%s. Check GitHub release assets and `gh auth status`.\n' "$os" "$arch" >&2
+    exit 1
     ;;
   setup)
     for dependency in az gh jq curl ssh-keygen node; do command -v "$dependency" >/dev/null || { printf 'Missing dependency: %s\n' "$dependency" >&2; exit 1; }; done

package/cmd/factory-ui/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -9,8 +10,10 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
@@ -48,6 +51,12 @@ type objective struct {
 	Tasks       []task `json:"tasks"`
 	PullRequest string `json:"pullRequest"`
 	Blocker     string `json:"blocker"`
+	Approval    *struct {
+		ApprovalID string `json:"approvalId"`
+		Status     string `json:"status"`
+		Policy     string `json:"policy"`
+		Reason     string `json:"reason"`
+	} `json:"approval"`
 }
 
 type workspace struct {
@@ -96,22 +105,32 @@ type snapshotMsg struct {
 	err          error
 }
 type tickMsg time.Time
-type resumeMsg struct{ err error }
+type commandResultMsg struct {
+	command, output string
+	err             error
+}
 
 type model struct {
-	client       *azblob.Client
-	factoryName  string
-	purpose      string
-	width        int
-	height       int
-	tab          int
-	scroll       int
-	dashboard    dashboard
-	logs         string
-	workspaces   []workspace
-	workspaceErr string
-	loading      bool
-	err          error
+	client            *azblob.Client
+	factoryName       string
+	purpose           string
+	width             int
+	height            int
+	tab               int
+	scroll            int
+	dashboard         dashboard
+	logs              string
+	workspaces        []workspace
+	workspaceErr      string
+	selectedWorkspace string
+	loading           bool
+	err               error
+	commandMode       bool
+	commandInput      string
+	commandOutput     string
+	commandHistory    []string
+	historyIndex      int
+	consoleScroll     int
 }
 
 var (
@@ -122,10 +141,26 @@ var (
 	muted  = lipgloss.Color("#7F8B99")
 	panel  = lipgloss.Color("#15191F")
 	border = lipgloss.Color("#303743")
-	tabs   = []string{"Overview", "Workspaces", "Objectives", "Agents", "Secrets", "Capabilities", "Logs", "Settings"}
+	tabs   = []string{"Dashboard", "Objectives", "Agents", "Settings"}
 	ansi   = regexp.MustCompile(`\x1b(?:\[[0-?]*[ -/]*[@-~]|\][^\x07\x1b]*(?:\x07|\x1b\\)?)`)
 )
 
+type synchronizedBuffer struct {
+	mu     sync.Mutex
+	buffer bytes.Buffer
+}
+
+func (value *synchronizedBuffer) Write(data []byte) (int, error) {
+	value.mu.Lock()
+	defer value.mu.Unlock()
+	return value.buffer.Write(data)
+}
+func (value *synchronizedBuffer) String() string {
+	value.mu.Lock()
+	defer value.mu.Unlock()
+	return value.buffer.String()
+}
+
 func clean(value string) string {
 	value = ansi.ReplaceAllString(value, "")
 	return strings.Map(func(character rune) rune {
@@ -136,6 +171,96 @@ func clean(value string) string {
 	}, value)
 }
 
+func parseCommandLine(value string) ([]string, error) {
+	var args []string
+	var current strings.Builder
+	var quote rune
+	escaped := false
+	flush := func() {
+		if current.Len() > 0 {
+			args = append(args, current.String())
+			current.Reset()
+		}
+	}
+	for _, character := range strings.TrimSpace(value) {
+		if escaped {
+			current.WriteRune(character)
+			escaped = false
+			continue
+		}
+		if character == '\\' && quote != '\'' {
+			escaped = true
+			continue
+		}
+		if quote != 0 {
+			if character == quote {
+				quote = 0
+			} else {
+				current.WriteRune(character)
+			}
+			continue
+		}
+		if character == '\'' || character == '"' {
+			quote = character
+			continue
+		}
+		if character == ' ' || character == '\t' {
+			flush()
+			continue
+		}
+		current.WriteRune(character)
+	}
+	if escaped || quote != 0 {
+		return nil, fmt.Errorf("unterminated quote or escape")
+	}
+	flush()
+	if len(args) > 0 && args[0] == "factory" {
+		args = args[1:]
+	}
+	return args, nil
+}
+
+func validateFactoryCommand(args []string) error {
+	if len(args) == 0 {
+		return fmt.Errorf("enter a factory command")
+	}
+	allowed := map[string]bool{"setup": true, "configure": true, "models": true, "acp": true, "extension": true, "github": true, "telegram": true, "workspace": true, "submit": true, "issue": true, "init": true, "secret": true, "dashboard": true, "status": true, "queue": true, "report": true, "logs": true, "doctor": true, "pause": true, "resume": true, "update": true, "approval": true, "help": true, "--help": true, "-h": true}
+	if args[0] == "ui" {
+		return fmt.Errorf("the UI command cannot be launched inside itself")
+	}
+	if !allowed[args[0]] {
+		return fmt.Errorf("unknown factory command: %s", args[0])
+	}
+	return nil
+}
+
+func interactiveFactoryCommand(args []string) bool {
+	if len(args) == 0 {
+		return false
+	}
+	return args[0] == "setup" || args[0] == "configure" || args[0] == "secret" && len(args) > 1 && args[1] == "set" || args[0] == "telegram" && len(args) > 1 && args[1] == "configure"
+}
+
+func executeFactoryCommand(args []string) tea.Cmd {
+	return func() tea.Msg {
+		command := "factory " + strings.Join(args, " ")
+		output, err := exec.Command("factory", args...).CombinedOutput()
+		return commandResultMsg{command: command, output: string(output), err: err}
+	}
+}
+
+func interactiveFactoryProcess(args []string) tea.Cmd {
+	var transcript synchronizedBuffer
+	command := exec.Command("factory", args...)
+	command.Stdin = os.Stdin
+	command.Stdout = io.MultiWriter(os.Stdout, &transcript)
+	command.Stderr = io.MultiWriter(os.Stderr, &transcript)
+	label := "factory " + strings.Join(args, " ")
+	return tea.ExecProcess(command, func(err error) tea.Msg {
+		return commandResultMsg{command: label, output: transcript.String(), err: err}
+	})
+}
+
 func readConfig() map[string]string {
 	result := map[string]string{}
 	for _, key := range []string{"FACTORY_STORAGE_ACCOUNT", "FACTORY_NAME", "FACTORY_PURPOSE"} {
@@ -203,6 +328,57 @@ func (m model) Init() tea.Cmd { return tea.Batch(fetchCmd(m.client), tickCmd())
 func (m model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := message.(type) {
 	case tea.KeyMsg:
+		if m.commandMode {
+			switch msg.String() {
+			case "esc":
+				m.commandMode = false
+				m.commandInput = ""
+			case "enter":
+				line := strings.TrimSpace(m.commandInput)
+				args, err := parseCommandLine(line)
+				if err == nil {
+					err = validateFactoryCommand(args)
+				}
+				if err != nil {
+					m.commandOutput = err.Error()
+					return m, nil
+				}
+				m.commandMode = false
+				m.commandInput = ""
+				m.commandHistory = append(m.commandHistory, line)
+				m.historyIndex = len(m.commandHistory)
+				if interactiveFactoryCommand(args) {
+					return m, interactiveFactoryProcess(args)
+				}
+				m.loading = true
+				return m, executeFactoryCommand(args)
+			case "backspace", "ctrl+h":
+				runes := []rune(m.commandInput)
+				if len(runes) > 0 {
+					m.commandInput = string(runes[:len(runes)-1])
+				}
+			case "ctrl+u":
+				m.commandInput = ""
+			case "up":
+				if m.historyIndex > 0 {
+					m.historyIndex--
+					m.commandInput = m.commandHistory[m.historyIndex]
+				}
+			case "down":
+				if m.historyIndex < len(m.commandHistory)-1 {
+					m.historyIndex++
+					m.commandInput = m.commandHistory[m.historyIndex]
+				} else {
+					m.historyIndex = len(m.commandHistory)
+					m.commandInput = ""
+				}
+			default:
+				if len(msg.Runes) > 0 {
+					m.commandInput += string(msg.Runes)
+				}
+			}
+			return m, nil
+		}
 		switch msg.String() {
 		case "q", "ctrl+c":
 			return m, tea.Quit
@@ -233,13 +409,67 @@ func (m model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
 			m.scroll += 10
 		case "home":
 			m.scroll = 0
-		case "o", "n", "i", "a", "p", "u", "y", "x":
-			return m, tea.ExecProcess(exec.Command("factory-ui"), func(err error) tea.Msg { return resumeMsg{err: err} })
+		case "[", "shift+up":
+			if index := m.selectedIndex(); index > 0 {
+				m.selectedWorkspace = m.workspaces[index-1].Name
+				m.scroll = 0
+			}
+		case "]", "shift+down":
+			if index := m.selectedIndex(); index >= 0 && index < len(m.workspaces)-1 {
+				m.selectedWorkspace = m.workspaces[index+1].Name
+				m.scroll = 0
+			}
+		case "ctrl+up":
+			if m.consoleScroll > 0 {
+				m.consoleScroll--
+			}
+		case "ctrl+down":
+			m.consoleScroll++
+		case ":", "/", "enter", "o":
+			m.commandMode = true
+			m.commandInput = ""
+			m.historyIndex = len(m.commandHistory)
+		case "n":
+			m.commandMode = true
+			m.commandInput = "submit "
+			if selected := m.selected(); selected != nil {
+				m.commandInput += selected.Name + " "
+			}
+			m.historyIndex = len(m.commandHistory)
+		case "i":
+			m.commandMode = true
+			m.commandInput = "workspace import "
+			m.historyIndex = len(m.commandHistory)
+		case "a":
+			m.commandMode = true
+			m.commandInput = "secret set "
+			m.historyIndex = len(m.commandHistory)
+		case "y":
+			m.commandMode = true
+			m.commandInput = "approval approve "
+			m.historyIndex = len(m.commandHistory)
+		case "x":
+			m.commandMode = true
+			m.commandInput = "approval deny "
+			m.historyIndex = len(m.commandHistory)
+		case "p":
+			m.loading = true
+			return m, executeFactoryCommand([]string{"pause"})
+		case "u":
+			m.loading = true
+			return m, executeFactoryCommand([]string{"resume"})
+		case "?":
+			m.loading = true
+			return m, executeFactoryCommand([]string{"--help"})
+		case "ctrl+l", "esc":
+			m.commandOutput = ""
+			m.consoleScroll = 0
+			m.err = nil
 		case "r":
 			m.loading = true
 			return m, fetchCmd(m.client)
 		default:
-			if len(msg.String()) == 1 && msg.String()[0] >= '1' && msg.String()[0] <= '8' {
+			if len(msg.String()) == 1 && msg.String()[0] >= '1' && msg.String()[0] <= '4' {
 				m.tab = int(msg.String()[0] - '1')
 				m.scroll = 0
 			}
@@ -251,13 +481,25 @@ func (m model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
 		m.err = msg.err
 		if msg.err == nil {
 			m.dashboard, m.logs, m.workspaces, m.workspaceErr = msg.dashboard, msg.logs, msg.workspaces, msg.workspaceErr
+			if len(m.workspaces) == 0 {
+				m.selectedWorkspace = ""
+			} else if m.selected() == nil {
+				m.selectedWorkspace = m.workspaces[0].Name
+			}
 		}
-	case resumeMsg:
-		m.err = msg.err
-		if msg.err == nil {
-			m.loading = true
-			return m, fetchCmd(m.client)
+	case commandResultMsg:
+		m.loading = false
+		m.err = nil
+		result := strings.TrimSpace(clean(msg.output))
+		if msg.err != nil && result == "" {
+			result = msg.err.Error()
+		}
+		m.commandOutput = fmt.Sprintf("$ %s\n%s", clean(msg.command), result)
+		m.consoleScroll = len(strings.Split(m.commandOutput, "\n")) - 4
+		if m.consoleScroll < 0 {
+			m.consoleScroll = 0
 		}
+		return m, fetchCmd(m.client)
 	case tickMsg:
 		if !m.loading {
 			m.loading = true
@@ -291,15 +533,58 @@ func trim(value string, max int) string {
 	return value
 }
 
+func normalizeRepository(value string) string {
+	return strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(value), "https://github.com/"), ".git")
+}
+
+func (m model) selected() *workspace {
+	for index := range m.workspaces {
+		if m.workspaces[index].Name == m.selectedWorkspace {
+			return &m.workspaces[index]
+		}
+	}
+	return nil
+}
+
+func (m model) selectedIndex() int {
+	for index, item := range m.workspaces {
+		if item.Name == m.selectedWorkspace {
+			return index
+		}
+	}
+	return -1
+}
+
+func (m model) visibleObjectives() []objective {
+	selected := m.selected()
+	if selected == nil {
+		return nil
+	}
+	repository := normalizeRepository(selected.Repository)
+	result := []objective{}
+	for _, item := range m.dashboard.Objectives {
+		if normalizeRepository(item.Repository) == repository {
+			result = append(result, item)
+		}
+	}
+	return result
+}
+
 func (m model) overview() string {
 	cost := "unavailable"
 	if m.dashboard.Cost != nil {
 		cost = fmt.Sprintf("%s %.2f", m.dashboard.Cost.Currency, m.dashboard.Cost.MonthToDate)
 	}
+	objectives := m.visibleObjectives()
+	countMap := map[string]int{}
+	for _, item := range objectives {
+		countMap[item.Status]++
+	}
 	counts := []string{}
-	for key, value := range m.dashboard.Summary.Objectives {
+	for key, value := range countMap {
 		counts = append(counts, fmt.Sprintf("%s %d", key, value))
 	}
+	sort.Strings(counts)
 	in, cached, out := 0, 0, 0
 	for _, value := range m.dashboard.ModelUsage {
 		in += value.InputTokens
@@ -307,8 +592,8 @@ func (m model) overview() string {
 		out += value.OutputTokens
 	}
 	value := fmt.Sprintf("%s\n\nHealth       %s\nQueue        %s\nDead letters %d\nAzure MTD    %s\nObjectives   %s\nTokens       %d in · %d cached · %d out\n\n%s\n\n", lipgloss.NewStyle().Bold(true).Render("SYSTEM"), badge(m.dashboard.Health.Status), lipgloss.NewStyle().Foreground(accent).Render(fmt.Sprint(m.dashboard.Queue.Active)), m.dashboard.Queue.DeadLetter, lipgloss.NewStyle().Foreground(warn).Render(cost), strings.Join(counts, "  "), in, cached, out, lipgloss.NewStyle().Bold(true).Render("RECENT OBJECTIVES"))
-	for index := len(m.dashboard.Objectives) - 1; index >= 0 && index >= len(m.dashboard.Objectives)-8; index-- {
-		item := m.dashboard.Objectives[index]
+	for index := len(objectives) - 1; index >= 0 && index >= len(objectives)-8; index-- {
+		item := objectives[index]
 		value += fmt.Sprintf("%s  %s\n    %s\n\n", badge(item.Status), trim(item.Objective, 90), lipgloss.NewStyle().Foreground(muted).Render(clean(item.Repository)))
 	}
 	return value
@@ -316,8 +601,9 @@ func (m model) overview() string {
 
 func (m model) objectives() string {
 	var value strings.Builder
-	for index := len(m.dashboard.Objectives) - 1; index >= 0; index-- {
-		item := m.dashboard.Objectives[index]
+	objectives := m.visibleObjectives()
+	for index := len(objectives) - 1; index >= 0; index-- {
+		item := objectives[index]
 		fmt.Fprintf(&value, "%s  %s\n%s\n", badge(item.Status), trim(item.Objective, 100), lipgloss.NewStyle().Foreground(muted).Render(clean(item.ID)))
 		for _, task := range item.Tasks {
 			state := task.State
@@ -336,6 +622,9 @@ func (m model) objectives() string {
 		if item.PullRequest != "" {
 			fmt.Fprintf(&value, "  PR %s\n", clean(item.PullRequest))
 		}
+		if item.Approval != nil {
+			fmt.Fprintf(&value, "  %s approval %s · %s\n  ID %s\n", badge(item.Approval.Status), clean(item.Approval.Policy), trim(item.Approval.Reason, 90), clean(item.Approval.ApprovalID))
+		}
 		value.WriteString("\n")
 	}
 	return value.String()
@@ -343,7 +632,7 @@ func (m model) objectives() string {
 
 func (m model) agents() string {
 	var value strings.Builder
-	for _, item := range m.dashboard.Objectives {
+	for _, item := range m.visibleObjectives() {
 		for _, task := range item.Tasks {
 			if task.State == "succeeded" {
 				continue
@@ -375,47 +664,80 @@ func (m model) agents() string {
 	return value.String()
 }
 
-func (m model) workspaceList() string {
+func (m model) sidebar(maxLines int) string {
+	var value strings.Builder
+	value.WriteString(lipgloss.NewStyle().Bold(true).Render("WORKSPACES") + "\n\n")
 	if m.workspaceErr != "" {
-		return "Workspace catalog unavailable: " + clean(m.workspaceErr)
+		value.WriteString(lipgloss.NewStyle().Foreground(danger).Render("Catalog unavailable") + "\n")
 	}
 	if len(m.workspaces) == 0 {
-		return "No workspaces imported. Press o, then i, to import a local path or owner/repo."
+		value.WriteString("No workspaces\n\nPress i to import")
 	}
-	var value strings.Builder
-	value.WriteString("IMPORTED WORKSPACES\n\n")
-	for _, item := range m.workspaces {
-		fmt.Fprintf(&value, "%s  %s\n  %s · %s\n\n", lipgloss.NewStyle().Foreground(accent).Bold(true).Render(clean(item.Name)), clean(item.Repository), clean(item.LocalPath), clean(item.BaseBranch))
+	available := maxLines - 7
+	if available < 1 {
+		available = 1
+	}
+	start := 0
+	if index := m.selectedIndex(); index >= available {
+		start = index - available + 1
+	}
+	end := start + available
+	if end > len(m.workspaces) {
+		end = len(m.workspaces)
 	}
+	if start > 0 {
+		value.WriteString(lipgloss.NewStyle().Foreground(muted).Render("  ↑ more") + "\n")
+	}
+	for _, item := range m.workspaces[start:end] {
+		marker := "  "
+		style := lipgloss.NewStyle().Foreground(muted)
+		if item.Name == m.selectedWorkspace {
+			marker = "› "
+			style = style.Foreground(accent).Bold(true)
+		}
+		value.WriteString(style.Render(marker+trim(item.Name, 20)) + "\n")
+	}
+	if end < len(m.workspaces) {
+		value.WriteString(lipgloss.NewStyle().Foreground(muted).Render("  ↓ more") + "\n")
+	}
+	value.WriteString("\n" + lipgloss.NewStyle().Foreground(muted).Render("[ / ] select\ni import\nn new objective"))
+	return value.String()
+}
+
+func (m model) settings() string {
+	var value strings.Builder
+	value.WriteString("RUNTIME\n")
+	fmt.Fprintf(&value, "  Name       %s\n  Purpose    %s\n  Storage    Azure Blob\n  Refresh    15 seconds\n\n", clean(m.factoryName), clean(m.purpose))
+	value.WriteString("MODELS\n  :models show\n  :models set ROLE PROVIDER/MODEL\n\nSECRETS (values hidden)\n")
+	for _, item := range m.dashboard.Secrets {
+		fmt.Fprintf(&value, "  ● %-36s %s\n", clean(item.Name), clean(item.Updated))
+	}
+	if len(m.dashboard.Secrets) == 0 {
+		value.WriteString("  No secret metadata available\n")
+	}
+	value.WriteString("\nCAPABILITIES\n  Skills, MCP servers, scanners, ACP, and signed extensions\n  :extension verify MANIFEST ARTIFACT PUBLIC_KEY\n")
+	value.WriteString("\nRECENT SERVICE LOGS\n")
+	lines := strings.Split(clean(m.logs), "\n")
+	if len(lines) > 30 {
+		lines = lines[len(lines)-30:]
+	}
+	value.WriteString(strings.Join(lines, "\n"))
 	return value.String()
 }
 
 func (m model) body() string {
+	if m.tab < 3 && m.selected() == nil {
+		return "SELECT A WORKSPACE\n\nImport one with i, then select it from the left sidebar.\nObjectives and agents are scoped to the selected workspace."
+	}
 	switch m.tab {
 	case 0:
 		return m.overview()
 	case 1:
-		return m.workspaceList()
-	case 2:
 		return m.objectives()
-	case 3:
+	case 2:
 		return m.agents()
-	case 4:
-		var b strings.Builder
-		b.WriteString("GLOBAL KEY VAULT\nValues are never displayed.\n\n")
-		for _, item := range m.dashboard.Secrets {
-			fmt.Fprintf(&b, "● %-55s %s\n", clean(item.Name), clean(item.Updated))
-		}
-		return b.String()
-	case 5:
-		return "CURATED CAPABILITIES\n\nSkills: /goal, /loop, TDD, debugging, verification, security, release discipline\nMCP: Context7, Playwright, knowledge-graph memory\nScanners: Trivy, Gitleaks, OSV-Scanner, Semgrep"
-	case 6:
-		if m.logs == "" {
-			return "No log snapshot available."
-		}
-		return clean(m.logs)
 	default:
-		return fmt.Sprintf("FACTORY SETTINGS\n\nName     %s\nPurpose  %s\nStorage  Azure Blob snapshot\nRefresh  15 seconds\n\nUse `factory configure models` or `factory models set ROLE PROVIDER/MODEL` to change routing.", clean(m.factoryName), clean(m.purpose))
+		return m.settings()
 	}
 }
 
@@ -425,6 +747,9 @@ func (m model) View() string {
 		width = 80
 	}
 	header := lipgloss.NewStyle().Bold(true).Foreground(accent).Render(strings.ToUpper(clean(m.factoryName))) + "  " + lipgloss.NewStyle().Foreground(muted).Render(clean(m.purpose))
+	if selected := m.selected(); selected != nil {
+		header += "  " + lipgloss.NewStyle().Foreground(blue).Render("/ "+clean(selected.Name))
+	}
 	tabValues := []string{}
 	for index, value := range tabs {
 		style := lipgloss.NewStyle().Padding(0, 1).Foreground(muted)
@@ -434,12 +759,21 @@ func (m model) View() string {
 		tabValues = append(tabValues, style.Render(fmt.Sprintf("%d %s", index+1, value)))
 	}
 	tabLine := lipgloss.JoinHorizontal(lipgloss.Top, tabValues...)
-	height := m.height - 6
-	if height < 10 {
-		height = 10
+	consoleHeight := 0
+	if m.commandOutput != "" {
+		consoleHeight = 7
+	}
+	mainHeight := m.height - 8 - consoleHeight
+	if mainHeight < 10 {
+		mainHeight = 10
+	}
+	sidebarWidth := 26
+	contentWidth := width - sidebarWidth - 5
+	if contentWidth < 50 {
+		contentWidth = 50
 	}
 	lines := strings.Split(m.body(), "\n")
-	visible := height - 2
+	visible := mainHeight - 2
 	maxScroll := len(lines) - visible
 	if maxScroll < 0 {
 		maxScroll = 0
@@ -452,15 +786,42 @@ func (m model) View() string {
 	if end > len(lines) {
 		end = len(lines)
 	}
-	content := lipgloss.NewStyle().Width(width-4).Height(height).Border(lipgloss.RoundedBorder()).BorderForeground(border).Padding(1, 2).Render(strings.Join(lines[scroll:end], "\n"))
-	footer := "←/→ tabs  ·  ↑/↓ scroll  ·  o actions  ·  r refresh  ·  q quit"
-	if m.loading {
-		footer = "Refreshing snapshot…"
+	sidebar := lipgloss.NewStyle().Width(sidebarWidth).Height(mainHeight).Border(lipgloss.RoundedBorder()).BorderForeground(border).Padding(1).Render(m.sidebar(mainHeight - 2))
+	content := lipgloss.NewStyle().Width(contentWidth).Height(mainHeight).Border(lipgloss.RoundedBorder()).BorderForeground(border).Padding(1, 2).Render(strings.Join(lines[scroll:end], "\n"))
+	main := lipgloss.JoinHorizontal(lipgloss.Top, sidebar, content)
+	console := ""
+	if m.commandOutput != "" {
+		consoleLines := strings.Split(clean(m.commandOutput), "\n")
+		maxConsoleScroll := len(consoleLines) - 4
+		if maxConsoleScroll < 0 {
+			maxConsoleScroll = 0
+		}
+		consoleScroll := m.consoleScroll
+		if consoleScroll > maxConsoleScroll {
+			consoleScroll = maxConsoleScroll
+		}
+		consoleEnd := consoleScroll + 4
+		if consoleEnd > len(consoleLines) {
+			consoleEnd = len(consoleLines)
+		}
+		console = lipgloss.NewStyle().Width(width-2).Height(5).Border(lipgloss.RoundedBorder()).BorderForeground(muted).Padding(0, 1).Render(fmt.Sprintf("CONSOLE · ctrl+↑/↓ scroll · ctrl+l clear  [%d-%d/%d]\n%s", consoleScroll+1, consoleEnd, len(consoleLines), strings.Join(consoleLines[consoleScroll:consoleEnd], "\n")))
+	}
+	prompt := "Press : to enter a Factory command  ·  n submit  ·  i import  ·  ? help  ·  q quit"
+	if m.commandMode {
+		prompt = lipgloss.NewStyle().Foreground(accent).Bold(true).Render("› ") + clean(m.commandInput) + "█"
+	} else if m.loading {
+		prompt = "Refreshing Factory state…"
+	}
+	if m.err != nil && !m.commandMode {
+		prompt = lipgloss.NewStyle().Foreground(danger).Render(m.err.Error())
 	}
-	if m.err != nil {
-		footer = lipgloss.NewStyle().Foreground(danger).Render(m.err.Error())
+	commandLine := lipgloss.NewStyle().Width(width-2).Height(1).Border(lipgloss.RoundedBorder()).BorderForeground(accent).Padding(0, 1).Render(prompt)
+	parts := []string{header, tabLine, main}
+	if console != "" {
+		parts = append(parts, console)
 	}
-	return lipgloss.JoinVertical(lipgloss.Left, header, tabLine, content, lipgloss.NewStyle().Foreground(muted).Render(footer))
+	parts = append(parts, commandLine)
+	return lipgloss.JoinVertical(lipgloss.Left, parts...)
 }
 
 func main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "factory-ai",
-  "version": "1.6.1",
+  "version": "2.1.0",
   "description": "Deploy a private autonomous coding-agent factory on Azure: isolated builders, testers, security reviewers, durable orchestration, multi-model routing, memory, cost controls, and gated GitHub pull requests.",
   "private": false,
   "license": "MIT",
@@ -32,7 +32,6 @@
   },
   "bin": {
     "factory": "bin/factory",
-    "factory-ui": "src/tui.js",
     "agent-factory-ceo": "src/ceo.js",
     "agent-factory-control": "src/control-service.js",
     "agent-factory-dashboard": "src/dashboard.js",
@@ -74,7 +73,6 @@
     "@modelcontextprotocol/server-memory": "2026.7.4",
     "@playwright/mcp": "0.0.78",
     "@upstash/context7-mcp": "3.2.3",
-    "neo-blessed": "0.2.0",
     "zod": "3.25.76"
   },
   "devDependencies": {

package/src/approval-cli.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+import { DefaultAzureCredential } from "@azure/identity";
+import { ServiceBusClient } from "@azure/service-bus";
+import { sendMessage } from "./bus.js";
+
+const [action, objectiveId, approvalId, ...reasonWords] = process.argv.slice(2);
+const decision = action === "approve" ? "approved" : action === "deny" ? "denied" : null;
+const reason = reasonWords.join(" ").trim();
+if (!decision || !/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(objectiveId ?? "") || !/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(approvalId ?? "") || !reason) throw new Error("Usage: factory approval approve|deny OBJECTIVE_ID APPROVAL_ID REASON");
+const namespace = process.env.SERVICE_BUS_NAMESPACE;
+if (!namespace) throw new Error("SERVICE_BUS_NAMESPACE is required");
+const client = new ServiceBusClient(namespace.includes(".") ? namespace : `${namespace}.servicebus.windows.net`, new DefaultAzureCredential());
+const sender = client.createSender(process.env.CONTROL_QUEUE ?? "control-events");
+const messageId = `approval-${objectiveId}-${approvalId}-${decision}`.slice(0, 64);
+try { await sendMessage(sender, { type: "approval_decision", objectiveId, approvalId, decision, actor: "local-operator", reason: reason.slice(0, 1000), decidedAt: new Date().toISOString(), messageId }, messageId, objectiveId); }
+finally { await sender.close(); await client.close(); }
+process.stdout.write(`${JSON.stringify({ objectiveId, approvalId, decision })}\n`);

package/src/tui.js

@@ -1,173 +0,0 @@
-#!/usr/bin/env node
-import blessed from "neo-blessed";
-import { createOperator } from "./operator.js";
-
-if (!process.stdin.isTTY || !process.stdout.isTTY) throw new Error("Factory AI UI requires an interactive terminal");
-
-const operator = createOperator();
-const factoryName = process.env.FACTORY_NAME ?? "Factory AI";
-const factoryPurpose = process.env.FACTORY_PURPOSE ?? "Ship secure reviewed software continuously";
-const screen = blessed.screen({ smartCSR: true, title: factoryName, fullUnicode: true, dockBorders: true });
-const colors = { bg: "#0d0f12", panel: "#15191f", border: "#303743", text: "#d9e0e8", muted: "#7f8b99", accent: "#78dba9", warn: "#efc46b", danger: "#ef7d7d", blue: "#77a8ff" };
-
-blessed.box({ parent: screen, top: 0, left: 0, width: "100%", height: 3, tags: true, style: { bg: colors.panel, fg: colors.text }, content: `  {bold}{#78dba9-fg}${factoryName.toUpperCase()}{/}  {/bold}  ${factoryPurpose}` });
-const menu = blessed.list({ parent: screen, top: 3, left: 0, width: 23, bottom: 2, border: { type: "line" }, label: " Navigate ", keys: true, mouse: true, vi: true, items: ["Overview", "Workspaces", "Objectives", "Agents", "Secrets", "Capabilities", "Logs", "Settings"], style: { bg: colors.panel, fg: colors.text, border: { fg: colors.border }, selected: { bg: colors.accent, fg: "#07130d", bold: true }, item: { fg: colors.text } } });
-const main = blessed.box({ parent: screen, top: 3, left: 23, right: 0, bottom: 2, border: { type: "line" }, label: " Overview ", tags: true, scrollable: true, alwaysScroll: true, keys: true, mouse: true, vi: true, scrollbar: { ch: "▐", style: { fg: colors.accent } }, padding: { left: 2, right: 2 }, style: { bg: colors.bg, fg: colors.text, border: { fg: colors.border } } });
-const footer = blessed.box({ parent: screen, bottom: 0, left: 0, width: "100%", height: 2, tags: true, style: { bg: colors.panel, fg: colors.muted }, content: "  {bold}n{/} new   {bold}i{/} import workspace   {bold}r{/} refresh   {bold}a{/} secret   {bold}y/x{/} approve/deny   {bold}q{/} quit" });
-
-let dashboard;
-let capabilities;
-let secrets;
-let logs;
-let workspaces = [];
-let section = "Overview";
-let refreshing = false;
-
-function safe(value) {
-  const text = String(value ?? "").replaceAll(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, "");
-  return blessed.escape ? blessed.escape(text) : text.replaceAll("{", "\\{").replaceAll("}", "\\}");
-}
-
-function status(message, color = colors.muted) {
-  footer.setContent(`  {${color}-fg}${message}{/}   {bold}n{/} new   {bold}i{/} import   {bold}r{/} refresh   {bold}q{/} quit`);
-  screen.render();
-}
-
-function badge(value) {
-  const color = value === "succeeded" || value === "complete" ? colors.accent : value === "failed" || value === "blocked" ? colors.danger : value === "running" ? colors.blue : colors.warn;
-  return `{${color}-fg}${value}{/}`;
-}
-
-function renderOverview() {
-  const cost = dashboard?.cost ? `${dashboard.cost.currency} ${dashboard.cost.monthToDate.toFixed(2)}` : "unavailable";
-  const counts = Object.entries(dashboard?.summary?.objectives ?? {}).map(([key, value]) => `${key} ${value}`).join("  ") || "none";
-  const modelUsage = Object.values(dashboard?.modelUsage ?? {});
-  const inputTokens = modelUsage.reduce((sum, item) => sum + item.inputTokens, 0);
-  const cachedTokens = modelUsage.reduce((sum, item) => sum + item.cachedInputTokens, 0);
-  const outputTokens = modelUsage.reduce((sum, item) => sum + item.outputTokens, 0);
-  const recent = (dashboard?.objectives ?? []).slice(-8).reverse().map((objective) => `  ${badge(objective.status.padEnd(9))}  {bold}${safe(objective.objective)}{/}\n             ${safe(objective.repository ?? "")}`).join("\n\n");
-  main.setContent(`{bold}System{/}\n\n  Queue       {#78dba9-fg}${dashboard?.queue?.active ?? 0}{/}\n  Dead letter ${dashboard?.queue?.deadLetter ?? 0}\n  Azure MTD   {#efc46b-fg}${cost}{/}\n  Objectives  ${counts}\n  Tokens      ${inputTokens} in · ${cachedTokens} cached · ${outputTokens} out\n\n{bold}Recent objectives{/}\n\n${recent || "  No objectives yet."}`);
-}
-
-function renderObjectives() {
-  main.setContent((dashboard?.objectives ?? []).slice().reverse().map((objective) => {
-    const tasks = objective.tasks.map((task) => `    ${badge((task.stale ? "stale" : task.state).padEnd(9))} ${task.role.padEnd(9)} {#7f8b99-fg}${safe(task.model)}{/}\n               ${safe(task.title)}${task.activity ? ` · ${safe(task.activity.type)}${task.activity.tool ? ` ${safe(task.activity.tool)}` : ""}` : ""}`).join("\n");
-    return `${badge(objective.status)} {bold}${safe(objective.objective)}{/}\n  ${safe(objective.id)}\n${tasks}${objective.pullRequest ? `\n  PR ${safe(objective.pullRequest)}` : ""}${objective.blocker ? `\n  {#ef7d7d-fg}${safe(objective.blocker)}{/}` : ""}`;
-  }).join("\n\n────────────────────────────────────────────────────────\n\n") || "No objectives." );
-}
-
-function renderAgents() {
-  const agents = (dashboard?.objectives ?? []).flatMap((objective) => objective.tasks.map((task) => ({ objective: objective.objective, ...task }))).filter((task) => !["succeeded"].includes(task.state));
-  main.setContent(agents.map((task) => `${badge((task.stale ? "stale" : task.state).padEnd(9))} {bold}${safe(task.role)}{/}  ${safe(task.model)}\n  ${safe(task.title)}\n  ${task.activity ? `${safe(task.activity.phase ?? task.activity.type)}${task.activity.tool ? ` · ${safe(task.activity.tool)}` : ""} · ${Math.round(task.activityAgeSeconds ?? 0)}s ago${task.retries ? ` · ${task.retries} retries` : ""}` : "No activity event yet"}${task.lastError ? `\n  {#ef7d7d-fg}${safe(task.lastError)}{/}` : ""}\n  {#7f8b99-fg}${safe(task.objective)}{/}`).join("\n\n") || "No active agents.");
-}
-
-function renderSecrets() {
-  main.setContent(`{bold}Global Azure Key Vault{/}\n{#7f8b99-fg}Values are never displayed. Press a to add or rotate a secret.{/}\n\n${(secrets ?? []).map((item) => `  {#78dba9-fg}●{/} ${item.name.padEnd(55)} ${item.updated ?? ""}`).join("\n") || "  Loading or empty."}`);
-}
-
-function renderCapabilities() {
-  const skills = Object.entries(capabilities?.skills ?? {}).map(([name, item]) => `  {#77a8ff-fg}skill{/}  ${name.padEnd(36)} ${item.roles.join(", ")}`).join("\n");
-  const mcp = Object.entries(capabilities?.mcp ?? {}).map(([name, item]) => `  {#78dba9-fg}mcp{/}    ${name.padEnd(36)} ${item.roles.join(", ")}`).join("\n");
-  main.setContent(`{bold}Skills{/}\n\n${skills}\n\n{bold}MCP servers{/}\n\n${mcp}`);
-}
-
-function renderSettings() {
-  const config = operator.config();
-  main.setContent(`{bold}Runtime{/}\n\n  Resource group  ${config.resourceGroup}\n  VM              ${config.vm}\n  Service Bus     ${config.namespace}\n  Key Vault       ${config.vault}\n  Operator state  ${config.storageAccount || "Run Command fallback"}\n\n{bold}Model policy{/}\n\n  Scout           GPT-5.4 nano\n  Simple builder  Kimi K2.7-Code\n  Builder         GPT-5.5\n  Tester          GPT-5.4\n  Critical roles  GPT-5.6\n\n{#7f8b99-fg}Run factory setup to change providers or role routes.{/}`);
-}
-
-function renderWorkspaces() {
-  main.setContent(`{bold}Imported workspaces{/}\n{#7f8b99-fg}Press i to import a local path or owner/repo. Press n to submit work by name.{/}\n\n${workspaces.map((workspace) => `  {#78dba9-fg}●{/} {bold}${safe(workspace.name)}{/}  ${safe(workspace.repository)}\n    ${safe(workspace.localPath ?? "remote only")} · ${safe(workspace.baseBranch)}`).join("\n\n") || "  No workspaces imported."}`);
-}
-
-function render() {
-  main.setLabel(` ${section} `);
-  if (section === "Overview") renderOverview();
-  else if (section === "Workspaces") renderWorkspaces();
-  else if (section === "Objectives") renderObjectives();
-  else if (section === "Agents") renderAgents();
-  else if (section === "Secrets") renderSecrets();
-  else if (section === "Capabilities") renderCapabilities();
-  else if (section === "Logs") main.setContent(safe(logs ?? "Loading logs..."));
-  else renderSettings();
-  main.setScrollPerc(0);
-  screen.render();
-}
-
-async function refresh() {
-  if (refreshing) return;
-  refreshing = true;
-  status("Refreshing...");
-  try {
-    dashboard = await operator.dashboard();
-    workspaces = await operator.listWorkspaces();
-    if (section === "Capabilities" && !capabilities) capabilities = await operator.capabilities();
-    if (section === "Secrets") secrets = dashboard?.secrets ?? await operator.listSecrets();
-    if (section === "Logs") logs = await operator.logs();
-    render();
-    status(`Updated ${new Date().toLocaleTimeString()}`);
-  } catch (error) { status(error.message, colors.danger); }
-  finally { refreshing = false; }
-}
-
-function ask(label, { secret = false } = {}) {
-  return new Promise((resolve) => {
-    const prompt = blessed.textbox({ parent: screen, top: "center", left: "center", width: "70%", height: 5, border: { type: "line" }, label: ` ${label} `, inputOnFocus: true, keys: true, mouse: true, censor: secret, style: { bg: colors.panel, fg: colors.text, border: { fg: colors.accent } } });
-    prompt.focus();
-    prompt.readInput((_, value) => { prompt.destroy(); screen.render(); resolve(value?.trim() ?? ""); });
-    screen.render();
-  });
-}
-
-async function submitObjective() {
-  const repository = await ask(`Workspace name${workspaces.length ? ` (${workspaces.map((item) => item.name).join(", ")})` : " or owner/repo"}`);
-  if (!repository) return;
-  const objective = await ask("CEO objective");
-  if (!objective) return;
-  status("Submitting objective...");
-  try { const result = await operator.submit(repository, objective); status(`Queued ${result.objectiveId ?? "objective"}`, colors.accent); await refresh(); } catch (error) { status(error.message, colors.danger); }
-}
-
-async function importWorkspace() {
-  const source = await ask("Local path or GitHub owner/repo"); if (!source) return;
-  const name = await ask("Workspace name (Enter for repository name)");
-  try { const workspace = await operator.importWorkspace(source, name); workspaces = await operator.listWorkspaces(); status(`Imported ${workspace.name}`, colors.accent); section = "Workspaces"; render(); } catch (error) { status(error.message, colors.danger); }
-}
-
-async function addSecret() {
-  if (section !== "Secrets") return status("Open Secrets before adding a key", colors.warn);
-  const name = await ask("Secret name");
-  if (!name) return;
-  const value = await ask("Secret value", { secret: true });
-  if (!value) return;
-  status("Storing secret...");
-  try {
-    await operator.setSecret(name, value);
-    secrets = [...(secrets ?? []).filter((item) => item.name !== name), { name, updated: new Date().toISOString() }].sort((left, right) => left.name.localeCompare(right.name));
-    renderSecrets();
-    status(`Stored ${name}`, colors.accent);
-  } catch (error) { status(error.message, colors.danger); }
-}
-
-async function decideApproval(decision) {
-  const objectiveId = await ask("Objective ID"); if (!objectiveId) return;
-  const approvalId = await ask("Approval ID"); if (!approvalId) return;
-  const reason = await ask(`${decision === "approved" ? "Approval" : "Denial"} reason`); if (!reason) return;
-  try { await operator.approval({ objectiveId, approvalId, decision, reason }); status(`Approval ${decision}`, decision === "approved" ? colors.accent : colors.danger); await refresh(); } catch (error) { status(error.message, colors.danger); }
-}
-
-menu.on("select", async (_, index) => { section = menu.getItem(index).getText(); render(); await refresh(); menu.focus(); });
-screen.key(["q", "C-c"], () => process.exit(0));
-screen.key("r", refresh);
-screen.key("n", submitObjective);
-screen.key("i", importWorkspace);
-screen.key("a", addSecret);
-screen.key("y", () => decideApproval("approved"));
-screen.key("x", () => decideApproval("denied"));
-screen.key("p", async () => { status("Pausing workers..."); try { await operator.control("pause"); status("Workers paused", colors.warn); } catch (error) { status(error.message, colors.danger); } });
-screen.key("u", async () => { status("Resuming workers..."); try { await operator.control("resume"); status("Workers active", colors.accent); } catch (error) { status(error.message, colors.danger); } });
-screen.key("tab", () => menu.focus());
-menu.focus();
-screen.render();
-await refresh();
-setInterval(refresh, 30_000).unref();