Skip to content

Merge main and resolve conflicts - integrate CLI auto-shutdown and refactor helpers - #52

Merged
clduab11 merged 6 commits into
branch-3-devtestfrom
copilot/sub-pr-48-yet-again
Feb 14, 2026
Merged

Merge main and resolve conflicts - integrate CLI auto-shutdown and refactor helpers#52
clduab11 merged 6 commits into
branch-3-devtestfrom
copilot/sub-pr-48-yet-again

Conversation

Copilot AI commented Feb 13, 2026

Copy link
Copy Markdown
Contributor

Main branch introduced resolveCliAutoShutdown() and refactored orchestration logic while this PR restructured README and added MCP workflows. Merge conflicts arose in 5 files.

Conflict Resolution Strategy

README.md: Kept PR's restructured content, inserted main's CODEX_CLI_AUTO_SHUTDOWN documentation after build commands section

Binary artifacts (.codex-synaptic/memory.db): Retained PR version via git checkout --ours - SQLite databases auto-rebuild on next run

Documentation (docs/runbooks/autoscaler-daemon-coordination.md): Kept PR's more comprehensive version

Dependencies (package-lock.json): Regenerated using npm install --ignore-scripts to merge both branches' updates

CLI implementation (src/cli/index.ts): Merged main's improvements into PR's refactored structure:

// Integrated main's auto-shutdown resolution
const autoShutdown = options.autoShutdown ?? cliAutoShutdown;

// Applied consistent helper usage
renderBackgroundDaemonStatus(status);  // vs inline status display

// Refactored orchestration into helpers
await executeClassicOrchestration(system, prompt, originalPrompt, config, options, codexContext, codexEnvelope);
await executeGoapStrategy(system, originalPrompt, options);

Import fixes: Added missing GoapExecutor import, removed duplicate setupWorkflowEventHandlers (already exported from hive-mind-helpers), fixed cleanup call pattern to use .cleanup() method

TypeScript compilation verified successful post-merge.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

clduab11 and others added 5 commits February 11, 2026 16:33
… status reporting [PAP-17] (#42)

* Fix codex-synaptic launch blockers

* Document launch readiness fixes

* Update docs/runbooks/autoscaler-daemon-coordination.md

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Update src/cli/index.ts

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Add JSDoc documentation to CLI lifecycle functions (#43)

* Initial plan

* Initial plan for adding docstrings

Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

* Add JSDoc docstrings for CLI functions

Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

* Consolidate docstring for resolveCliAutoShutdown

Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

* Add JSDoc documentation to satisfy 80% docstring coverage threshold (#44)

* Initial plan

* Add comprehensive JSDoc documentation to CLI functions

- Added 45+ JSDoc docstrings to previously undocumented functions
- Documented all lifecycle functions (loadEnvFile, bootstrapCliEnv, etc.)
- Documented all rendering functions (renderAgentTable, renderMeshStatus, etc.)
- Documented all interactive menu functions (interactiveSystemMenu, etc.)
- Documented all utility functions (parseInteger, formatBytes, tokenizeCliArgs, etc.)
- Documented helper functions (shouldAutoAttachCodexContext, shouldRequireConsensus, etc.)
- All docstrings follow JSDoc format with @param, @returns, and @remarks tags
- Improves docstring coverage toward 80% threshold requirement

Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

* Add JSDoc documentation to OpenAI and core utility functions

- Added docstrings to OpenAI credential resolution functions
- Added docstrings to model catalog functions (getStaticOpenAIModelCatalog, mergeModelInventory)
- Added docstrings to inference functions (inferModalitiesFromIdentifier, inferCapabilitiesFromIdentifier)
- Added docstrings to core system helper functions (cloneCodexContext, cloneCodexEnvelope, cloneFileTreeNode)
- All docstrings follow JSDoc format with @param, @returns, and @remarks tags
- Further improves docstring coverage across modified files

Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

* Refactor complex hive-mind spawn handler to resolve CodeFactor complexity warnings (#45)

* Initial plan

* Refactor complex hive-mind spawn command into helper functions

Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>

* Update src/cli/index.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Chris Dukes <chrisdukes@iMac.attlocal.net>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: clduab11 <185000089+clduab11@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com>
- Keep PR's restructured README and add CLI auto-shutdown note from main
- Use renderBackgroundDaemonStatus helper consistently
- Refactor GOAP and orchestration logic into helper functions
- Regenerate package-lock.json to resolve dependency conflicts
- Fix GoapExecutor import and remove duplicate setupWorkflowEventHandlers
Copilot AI changed the title [WIP] Add MCP workflows and growth automation documentation Merge main and resolve conflicts - integrate CLI auto-shutdown and refactor helpers Feb 13, 2026
Copilot AI requested a review from clduab11 February 13, 2026 04:17
@clduab11
clduab11 marked this pull request as ready for review February 14, 2026 03:00
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@github-actions

Copy link
Copy Markdown

Codex PR Review

Findings

  • P0: codex-synaptic system start now shuts the orchestrator back down immediately. resolveCliAutoShutdown() defaults to true whenever CODEX_CLI_AUTO_SHUTDOWN is unset (src/cli/index.ts:206-215), useSystem honors that default and auto-shuts any newly created session (src/cli/index.ts:787-818), and system start invokes useSystem without overriding autoShutdown (src/cli/index.ts:2753-2759). As a result, running codex-synaptic system start with default env brings the system up and then tears it down before the command exits; the very next system status reports “System not started,” making the command unusable.
  • P2: codex-synaptic background status lost critical diagnostics. It now only calls renderBackgroundDaemonStatus (src/cli/index.ts:3034-3037), whose new implementation omits the runtime snapshot lookup and no longer prints CWD, socket/log paths, or readiness (src/cli/index.ts:932-949). On main, the command fetched queryBackgroundRuntimeSnapshot() and surfaced those fields, which operators rely on for daemon debugging.

Suggested Fixes

  • Update lifecycle handling so system start keeps the session alive—e.g., either revert the default to non-autoshutdown or pass { autoShutdown: false } when invoking useSystem for commands that are supposed to keep the orchestrator running.
  • Restore the background status diagnostics by querying queryBackgroundRuntimeSnapshot() and printing the previously available metadata (cwd, socket, runtime/log paths, readiness) alongside the basic fields.

MCP Usage

  • deepwiki – unavailable (missing DEEPWIKI_API_KEY).
  • context7 – unavailable (resources/list method not exposed).
  • brave – unavailable (handshake failed/connection closed).
  • jina – unavailable (missing JINA_API_KEY).
  • firecrawl – unavailable (handshake failed/connection closed).

@clduab11
clduab11 merged commit 9dedf9c into branch-3-devtest Feb 14, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants