rl-workspaces 0.5.0 → 0.7.0

package/dist/workflow.js

@@ -16,8 +16,6 @@ const COMMAND_OPTIONS = {
     exec: ["workspace"],
     setup: ["workspace", "dry-run"],
     switch: ["create", "base", "no-fetch", "setup", "agent", "output-path"],
-    new: ["base", "no-fetch", "setup", "output-path"],
-    open: ["branch", "base", "no-fetch", "setup", "output-path"],
 };
 async function createWorkspace(context, name, base, noFetch, options = {}) {
     if (name.startsWith("-") ||
@@ -29,8 +27,7 @@ async function createWorkspace(context, name, base, noFetch, options = {}) {
         throw new Error(`Invalid workspace name: ${name}`);
     git(context.repo, "check-ref-format", "--branch", name);
     return locked(path.join(context.store.root, CREATE_LOCK), LOCK_FILE, async () => {
-        const directoryName = options.directoryName ?? name;
-        const destination = path.resolve(context.managedDir, directoryName);
+        const destination = path.resolve(context.managedDir, name);
         if (!inside(destination, context.managedDir) ||
             canonical(destination) !== destination)
             throw new Error("Workspace path must stay inside the managed directory without symlinks");
@@ -41,7 +38,7 @@ async function createWorkspace(context, name, base, noFetch, options = {}) {
             const [root, branch] = context.store.worktree(registered.worktree);
             if (branch !== name)
                 throw new Error("Workspace branch changed during selection; retry");
-            return { path: root, name: directoryName, branch, created: false };
+            return { path: root, name, branch, created: false };
         }
         if (fs.existsSync(destination))
             throw new Error(`Workspace path already exists: ${destination}`);
@@ -83,7 +80,7 @@ async function createWorkspace(context, name, base, noFetch, options = {}) {
         git(context.repo, "worktree", "add", ...creationArgs);
         return {
             path: destination,
-            name: directoryName,
+            name,
             branch: name,
             created: true,
         };
@@ -92,7 +89,7 @@ async function createWorkspace(context, name, base, noFetch, options = {}) {
 export async function main(argv) {
     const separator = argv.indexOf("--");
     const forwarded = separator < 0 ? [] : argv.slice(separator + 1);
-    const { values, positionals } = args(separator < 0 ? argv : argv.slice(0, separator), [...contextOptions, "base", "branch", "workspace", "agent", "output-path"], ["create", "no-fetch", "setup", "dry-run"], { create: "c", base: "b" });
+    const { values, positionals } = args(separator < 0 ? argv : argv.slice(0, separator), [...contextOptions, "base", "workspace", "agent", "output-path"], ["create", "no-fetch", "setup", "dry-run"], { create: "c", base: "b" });
     const context = commandContext(values);
     const [command, ...names] = positionals;
     const allowedOptions = COMMAND_OPTIONS[command];
@@ -101,10 +98,8 @@ export async function main(argv) {
     for (const option of Object.keys(values))
         if (!contextOptions.includes(option) && !allowedOptions.includes(option))
             throw new Error(`--${option} is not supported by rl ${command}`);
-    if (command === "switch" &&
-        !values.create &&
-        (values.base || values["no-fetch"]))
-        throw new Error("--base and --no-fetch require --create with rl switch");
+    if (command === "switch" && !values.create && values.base)
+        throw new Error("--base requires --create with rl switch");
     const selector = typeof values.workspace === "string" ? values.workspace : undefined;
     if (forwarded.length &&
         command !== "exec" &&
@@ -132,7 +127,7 @@ export async function main(argv) {
             console.log(file);
         }
         else
-            throw new Error("Usage: rl config show|init");
+            throw new Error("Usage: rl setup show|init");
         return 0;
     }
     if (command === "exec") {
@@ -159,35 +154,26 @@ export async function main(argv) {
             });
         });
     }
-    if (!["switch", "new", "open"].includes(command))
-        throw new Error("Unknown workspace workflow command");
-    arity(names, command === "open" ? 0 : 1);
-    const selectedBranch = values.branch ?? (command === "open" ? values.base : undefined);
-    if (command === "open" && typeof selectedBranch !== "string")
-        throw new Error("Usage: rl open --branch <branch>");
+    arity(names, 1);
     const agent = typeof values.agent === "string" ? values.agent : undefined;
     if (agent && !SUPPORTED_AGENTS.has(agent))
         throw new Error("Agent must be codex or claude");
-    const base = command !== "open" && typeof values.base === "string"
-        ? values.base
-        : context.defaultBase;
-    const creating = !!values.create || command === "new" || command === "open";
-    const branch = typeof selectedBranch === "string"
-        ? selectedBranch.replace(/^origin\//, "")
-        : names[0];
-    const target = creating
-        ? await createWorkspace(context, branch, base, !!values["no-fetch"], command === "switch"
-            ? {}
-            : {
-                reuseExisting: true,
-                ...(command === "open"
-                    ? {
-                        directoryName: branch.replaceAll("/", "-"),
-                        requireBranch: true,
-                    }
-                    : {}),
-            })
-        : resolveWorkspace(context, names[0]);
+    const base = typeof values.base === "string" ? values.base : context.defaultBase;
+    let target;
+    if (values.create) {
+        target = await createWorkspace(context, names[0], base, !!values["no-fetch"]);
+    }
+    else {
+        try {
+            target = resolveWorkspace(context, names[0]);
+        }
+        catch (error) {
+            if (!(error instanceof Error) ||
+                !error.message.startsWith("Workspace not found:"))
+                throw error;
+            target = await createWorkspace(context, names[0].replace(/^origin\//, ""), base, !!values["no-fetch"], { reuseExisting: true, requireBranch: true });
+        }
+    }
     await context.store.adopt(target.path, base);
     if (values.setup) {
         const code = await locked(path.join(context.store.root, SETUP_LOCK), LOCK_FILE, () => {

package/lib/entry.zsh

@@ -0,0 +1,54 @@
+#!/bin/zsh -f
+emulate -L zsh
+readonly rl_home="${${(%):-%x}:A:h:h}"
+if [[ "$1" == __hook ]]; then
+  # Hooks resolve the installed CLI on PATH, not a version-specific package path.
+  # Their explicit repository/state arguments must not be replaced by user config.
+  shift
+  exec node "$rl_home/dist/cli.js" state "$@"
+fi
+if [[ "$1" == --version || "$1" == -V ]]; then
+  exec node -p 'JSON.parse(require("node:fs").readFileSync(process.argv[1], "utf8")).version' "$rl_home/package.json"
+fi
+if [[ "$1" == setup && "$2" == shell ]]; then
+  if (( $# == 2 )); then
+    exec node "$rl_home/dist/help.js" setup shell
+  fi
+  for argument in "$@"; do
+    [[ "$argument" == -- ]] && break
+    if [[ "$argument" == --help || "$argument" == -h ]]; then
+      exec node "$rl_home/dist/help.js" "$@"
+    fi
+  done
+  if [[ "$3" != zsh && "$3" != bash || $# != 3 ]]; then
+    print -u2 'Usage: rl setup shell <zsh|bash>'
+    exit 1
+  fi
+  if [[ "$3" == zsh ]]; then
+    print -r -- "source ${(q)rl_home}/shell/rl.zsh"
+  else
+    print -r -- "_rl_executable=${(qq)rl_home}/bin/rl"
+    cat <<'BASH'
+rl() {
+  local destination_file destination result previous="$PWD"
+  local -a arguments=("$@")
+  if [[ "$1" == switch && "${2:-}" == - ]]; then
+    [[ -n "${RL_PREVIOUS_WORKSPACE:-}" ]] || { printf '%s\n' 'No previous workspace in this shell' >&2; return 1; }
+    arguments[1]="$RL_PREVIOUS_WORKSPACE"
+  fi
+  destination_file=$(mktemp "${TMPDIR:-/tmp}/rl-shell.XXXXXXXX") || return 1
+  if RL_SHELL_OUTPUT="$destination_file" command "$_rl_executable" "${arguments[@]}"; then result=0; else result=$?; fi
+  destination=$(cat -- "$destination_file")
+  rm -f -- "$destination_file"
+  if [[ -n "$destination" ]]; then
+    builtin cd -- "$destination" || return 1
+    RL_PREVIOUS_WORKSPACE="$previous"
+  fi
+  return "$result"
+}
+BASH
+  fi
+  exit 0
+fi
+source "$rl_home/lib/rl.zsh" || exit 1
+_rl_main "$@"

package/lib/rl.zsh

@@ -24,6 +24,12 @@ _rl_change_directory() {
     print -rn -- "$PWD" > "$RL_SHELL_OUTPUT"
   else
     print -r -- "$PWD"
+    if [[ -t 1 && -t 2 ]]; then
+      case "${SHELL:t}" in
+        zsh|bash) print -u2 -r -- "Enable directory switching: eval \"\$(rl setup shell ${SHELL:t})\"" ;;
+        *) print -u2 'Enable directory switching with shell integration: rl help setup shell' ;;
+      esac
+    fi
   fi
 }
 
@@ -57,12 +63,12 @@ _rl_main() {
       return
     fi
   done
-  if (( ${#help_args} == 1 )) && [[ "$help_args[1]" == (agent|workflow|policy|repo|git|notes|session|config|step) ]]; then
+  if (( ${#help_args} == 1 )) && [[ "$help_args[1]" == (agent|workflow|policy|repo|git|notes) ]]; then
     _rl_help "${help_args[@]}"
     return
   fi
 
-  # Canonical command families; older spellings remain compatibility aliases.
+  # Translate public command families to their internal handlers.
   # Preserve a leading repository selector while normalizing the public command.
   local -a routing_prefix=()
   if [[ "$1" == --repo ]]; then
@@ -72,9 +78,24 @@ _rl_main() {
     routing_prefix=("$1")
     shift
   fi
+  case "$1" in
+    new|open|instances|merge|clean|summary|handoff|mcp|session|context|progress|config|adopt|init)
+      print -u2 -r -- "Unknown command: $1"
+      print -u2 'Run rl help for available commands.'
+      return 1 ;;
+    status)
+      if (( ${argv[(Ie)--all]} || ${argv[(Ie)--list]} )); then
+        print -u2 'Use rl list for workspace overviews.'
+        return 1
+      fi ;;
+  esac
   case "$1:$2" in
-    git:commit|git:rebase|git:squash) argv=(step "$2" "${@:3}") ;;
-    git:diff|git:log|git:merge) argv=("$2" "${@:3}") ;;
+    setup:dependencies|setup:install)
+      local setup_module=dependencies
+      [[ "$2" == install ]] && setup_module=install
+      command node "${${functions_source[_rl_main]}:A:h:h}/dist/$setup_module.js" "${@:3}"
+      return ;;
+    git:merge) argv=("$2" "${@:3}") ;;
     agent:sessions) argv=(session list "${@:3}") ;;
     agent:save) argv=(session save "${@:3}") ;;
     agent:handoff) argv=(handoff "${@:3}") ;;
@@ -82,9 +103,10 @@ _rl_main() {
     storage:clean) argv=(clean "${@:3}") ;;
     setup:init|setup:show) argv=(config "$2" "${@:3}") ;;
     setup:adopt) argv=(adopt "${@:3}") ;;
+    setup:mcp) argv=(mcp-setup "${@:3}") ;;
     setup:run) argv=(setup "${@:3}") ;;
     setup:shell)
-      command "${${functions_source[_rl_main]}:A:h:h}/bin/rl" init "${@:3}"
+      command "${${functions_source[_rl_main]}:A:h:h}/bin/rl" setup shell "${@:3}"
       return ;;
     notes:summary) argv=(summary "${@:3}") ;;
     notes:show|notes:path|notes:set|notes:append)
@@ -210,13 +232,19 @@ _rl_main() {
       --default-base "$default_base" "$@"
     return
   fi
-  if [[ "$command" == pr && ( "$2" == checks || "$2" == checkout ) ]]; then
+  if [[ "$command" == pr && "$2" == checkout ]]; then
     command node "${${functions_source[_rl_main]}:A:h:h}/dist/cli.js" pr \
       --repo "$repo_root" --state-dir "$state_dir" --base-dir "$base_dir/$repo_name" \
       --default-base "$default_base" "$@"
     return
   fi
   case "$command" in
+    mcp-setup)
+      shift
+      command node "${${functions_source[_rl_main]}:A:h:h}/dist/cli.js" mcp-setup \
+        --repo "$repo_root" --state-dir "$state_dir" --base-dir "$base_dir/$repo_name" \
+        --default-base "$default_base" "$@"
+      return ;;
     storage|clean)
       command node "${${functions_source[_rl_main]}:A:h:h}/dist/cli.js" storage \
         --repo "$repo_root" --state-dir "$state_dir" --base-dir "$base_dir/$repo_name" \
@@ -227,7 +255,7 @@ _rl_main() {
         --repo "$repo_root" --state-dir "$state_dir" --base-dir "$base_dir/$repo_name" \
         --default-base "$default_base" "$@"
       return ;;
-    step|merge|diff|log)
+    merge)
       command node "${${functions_source[_rl_main]}:A:h:h}/dist/cli.js" git \
         --repo "$repo_root" --state-dir "$state_dir" --base-dir "$base_dir/$repo_name" \
         --default-base "$default_base" "$@"
@@ -261,13 +289,13 @@ _rl_main() {
       command node "${${functions_source[_rl_main]}:A:h:h}/dist/cli.js" summary \
         --repo "$repo_root" --state-dir "$state_dir" --default-base "$default_base" "$@"
       return ;;
-    adopt|doctor|status|instances|resume|session|context|progress|pr)
+    adopt|doctor|status|resume|session|context|progress|pr)
       _rl_state "$@"
       return ;;
   esac
 
   case "$command" in
-    switch|new|open|continue)
+    switch|continue)
       if [[ "$command" == switch && "$2" == - ]]; then
         [[ -n "${RL_PREVIOUS_WORKSPACE:-}" ]] || { print -u2 'No previous workspace in this shell'; return 1; }
         argv[2]="$RL_PREVIOUS_WORKSPACE"

package/node_modules/proper-lockfile/CHANGELOG.md

@@ -0,0 +1,108 @@
+# Change Log
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+<a name="4.1.2"></a>
+## [4.1.2](https://github.com/moxystudio/node-proper-lockfile/compare/v4.1.1...v4.1.2) (2021-01-25)
+
+
+### Bug Fixes
+
+* fix node 14 updating graceful-fs ([#102](https://github.com/moxystudio/node-proper-lockfile/issues/102)) ([b0d988e](https://github.com/moxystudio/node-proper-lockfile/commit/b0d988e))
+
+
+
+<a name="4.1.1"></a>
+## [4.1.1](https://github.com/moxystudio/node-proper-lockfile/compare/v4.1.0...v4.1.1) (2019-04-03)
+
+
+### Bug Fixes
+
+* fix mtime precision on some filesystems ([#88](https://github.com/moxystudio/node-proper-lockfile/issues/88)) ([f266158](https://github.com/moxystudio/node-proper-lockfile/commit/f266158)), closes [#82](https://github.com/moxystudio/node-proper-lockfile/issues/82) [#87](https://github.com/moxystudio/node-proper-lockfile/issues/87)
+
+
+
+<a name="4.1.0"></a>
+# [4.1.0](https://github.com/moxystudio/node-proper-lockfile/compare/v4.0.0...v4.1.0) (2019-03-18)
+
+
+### Features
+
+* allow second precision in mtime comparison ([#78](https://github.com/moxystudio/node-proper-lockfile/issues/78)) ([b2816a6](https://github.com/moxystudio/node-proper-lockfile/commit/b2816a6))
+
+
+
+<a name="4.0.0"></a>
+# [4.0.0](https://github.com/moxystudio/node-proper-lockfile/compare/v3.2.0...v4.0.0) (2019-03-12)
+
+
+### Bug Fixes
+
+* fix typo in error message ([#68](https://github.com/moxystudio/node-proper-lockfile/issues/68)) ([b91cb55](https://github.com/moxystudio/node-proper-lockfile/commit/b91cb55))
+
+
+### Features
+
+* make staleness check more robust ([#74](https://github.com/moxystudio/node-proper-lockfile/issues/74)) ([9cc0973](https://github.com/moxystudio/node-proper-lockfile/commit/9cc0973)), closes [#71](https://github.com/moxystudio/node-proper-lockfile/issues/71) [/github.com/ipfs/js-ipfs-repo/issues/188#issuecomment-468682971](https://github.com//github.com/ipfs/js-ipfs-repo/issues/188/issues/issuecomment-468682971)
+
+
+### BREAKING CHANGES
+
+* We were marking the lock as compromised when system went into sleep or if the event loop was busy taking too long to run the internals timers, Now we keep track of the mtime updated by the current process, and if we lose some cycles in the update process but recover and the mtime is still ours we do not mark the lock as compromised.
+
+
+
+<a name="3.2.0"></a>
+# [3.2.0](https://github.com/moxystudio/node-proper-lockfile/compare/v3.1.0...v3.2.0) (2018-11-19)
+
+
+### Features
+
+* add lock path option ([#66](https://github.com/moxystudio/node-proper-lockfile/issues/66)) ([32f1b8d](https://github.com/moxystudio/node-proper-lockfile/commit/32f1b8d))
+
+
+
+<a name="3.1.0"></a>
+# [3.1.0](https://github.com/moxystudio/node-proper-lockfile/compare/v3.0.2...v3.1.0) (2018-11-15)
+
+
+### Bug Fixes
+
+* **package:** update retry to version 0.12.0 ([#50](https://github.com/moxystudio/node-proper-lockfile/issues/50)) ([d400b98](https://github.com/moxystudio/node-proper-lockfile/commit/d400b98))
+
+
+### Features
+
+* add signal exit ([#65](https://github.com/moxystudio/node-proper-lockfile/issues/65)) ([f20bc45](https://github.com/moxystudio/node-proper-lockfile/commit/f20bc45))
+
+
+
+<a name="3.0.2"></a>
+## [3.0.2](https://github.com/moxystudio/node-proper-lockfile/compare/v3.0.1...v3.0.2) (2018-01-30)
+
+
+
+<a name="3.0.1"></a>
+## [3.0.1](https://github.com/moxystudio/node-proper-lockfile/compare/v3.0.0...v3.0.1) (2018-01-20)
+
+
+### Bug Fixes
+
+* restore ability to use lockfile() directly ([0ef8fbc](https://github.com/moxystudio/node-proper-lockfile/commit/0ef8fbc))
+
+
+
+<a name="3.0.0"></a>
+# [3.0.0](https://github.com/moxystudio/node-proper-lockfile/compare/v2.0.1...v3.0.0) (2018-01-20)
+
+
+### Chores
+
+* update project to latest node lts ([b1d43e5](https://github.com/moxystudio/node-proper-lockfile/commit/b1d43e5))
+
+
+### BREAKING CHANGES
+
+* remove callback support
+* use of node lts language features such as object spread
+* compromised function in lock() has been moved to an option

package/node_modules/smol-toml/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) Squirrel Chat et al., All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.