Pass cons arg to fcns (#21 )

fix prerelease input handling (#25 )
Split dev and stable branch workflows (#22 )
2026-11-10 12:31:26 -10:00 · 2026-10-27 23:01:54 +08:00 · 2026-10-26 11:09:08 +00:00 · 2026-10-25 22:22:25 +00:00
8 changed files with 223 additions and 118 deletions
@@ -2,14 +2,19 @@ name: CI

 on:
  push:
-    branches: [main]
+    branches: [dev, stable]
  pull_request:
-    branches: [main]
+  workflow_dispatch:

 # Dependency pins, bumped by update-deps workflow.
+# dev builds rizin from its dev branch, stable uses the pinned release.
+# RIZIN_DEV_REF can be a branch name or a commit sha (just-in-case).
+# PRs use the base branch, pushes/dispatches use the ref.
 env:
  RIZIN_VERSION: v0.9.1
+  RIZIN_DEV_REF: dev
  FRIDA_VERSION: 17.17.0
+  RIZIN_FLAVOR: ${{ (github.base_ref == 'dev' || github.ref_name == 'dev') && 'dev' || 'release' }}

 jobs:
  linux-frida:
@@ -22,15 +27,26 @@ jobs:
        with: { node-version: '24' }

      - name: Install rizin
+        env:
+          GH_TOKEN: ${{ github.token }}
        run: |
+          set -euo pipefail
          pip install meson ninja PyYAML
-          wget -q "https://github.com/rizinorg/rizin/releases/download/${RIZIN_VERSION}/rizin-src-${RIZIN_VERSION}.tar.xz"
-          tar xf rizin-src-${RIZIN_VERSION}.tar.xz
-          cd rizin-${RIZIN_VERSION}
-          meson setup build --prefix=/usr -Dblob=true
-          ninja -C build
-          sudo ninja -C build install
-          cd ..
+          if [ "$RIZIN_FLAVOR" = dev ]; then
+            curl -fsSL "https://github.com/rizinorg/rizin/archive/${RIZIN_DEV_REF}.tar.gz" -o rizin-dev.tar.gz
+            mkdir -p rizin-dev-src
+            tar xf rizin-dev.tar.gz -C rizin-dev-src --strip-components=1
+            src=rizin-dev-src
+            echo "rizin dev ref: ${RIZIN_DEV_REF} ($(gh api "repos/rizinorg/rizin/commits/${RIZIN_DEV_REF}" --jq .sha 2>/dev/null || echo unknown))"
+          else
+            wget -q "https://github.com/rizinorg/rizin/releases/download/${RIZIN_VERSION}/rizin-src-${RIZIN_VERSION}.tar.xz"
+            tar xf "rizin-src-${RIZIN_VERSION}.tar.xz"
+            src="rizin-${RIZIN_VERSION}"
+            echo "rizin release: ${RIZIN_VERSION}"
+          fi
+          meson setup "$src/build" "$src" --prefix=/usr -Dblob=true
+          ninja -C "$src/build"
+          sudo ninja -C "$src/build" install

      - name: Build (with frida-core)
        run: |
@@ -56,15 +72,26 @@ jobs:
        with: { node-version: '24' }

      - name: Install rizin
+        env:
+          GH_TOKEN: ${{ github.token }}
        run: |
+          set -euo pipefail
          pip install meson ninja PyYAML
-          wget -q "https://github.com/rizinorg/rizin/releases/download/${RIZIN_VERSION}/rizin-src-${RIZIN_VERSION}.tar.xz"
-          tar xf rizin-src-${RIZIN_VERSION}.tar.xz
-          cd rizin-${RIZIN_VERSION}
-          meson setup build --prefix=/usr -Dblob=true
-          ninja -C build
-          sudo ninja -C build install
-          cd ..
+          if [ "$RIZIN_FLAVOR" = dev ]; then
+            curl -fsSL "https://github.com/rizinorg/rizin/archive/${RIZIN_DEV_REF}.tar.gz" -o rizin-dev.tar.gz
+            mkdir -p rizin-dev-src
+            tar xf rizin-dev.tar.gz -C rizin-dev-src --strip-components=1
+            src=rizin-dev-src
+            echo "rizin dev ref: ${RIZIN_DEV_REF} ($(gh api "repos/rizinorg/rizin/commits/${RIZIN_DEV_REF}" --jq .sha 2>/dev/null || echo unknown))"
+          else
+            wget -q "https://github.com/rizinorg/rizin/releases/download/${RIZIN_VERSION}/rizin-src-${RIZIN_VERSION}.tar.xz"
+            tar xf "rizin-src-${RIZIN_VERSION}.tar.xz"
+            src="rizin-${RIZIN_VERSION}"
+            echo "rizin release: ${RIZIN_VERSION}"
+          fi
+          meson setup "$src/build" "$src" --prefix=/usr -Dblob=true
+          ninja -C "$src/build"
+          sudo ninja -C "$src/build" install

      - name: Build (without frida-core)
        run: |
@@ -3,7 +3,7 @@ name: Lint
 on:
  pull_request:
  push:
-    branches: [main]
+    branches: [dev, stable]

 jobs:
  changes:
@@ -2,6 +2,7 @@ name: Release

 # Builds and tests the rizin and cutter plugins 
 # and optionally publishes a GitHub release.
+# Releases are from the stable branch, dev has no releases.

 on:
  workflow_dispatch:
@@ -27,9 +28,11 @@ on:
  pull_request:
    branches:
      - '**release**'
+      - stable
  push:
    branches:
      - '**release**'
+      - stable

 # Dependency pins, bumped by the update-deps workflow.
 env:
@@ -49,6 +52,14 @@ jobs:
    name: Test gate
    runs-on: ubuntu-24.04
    steps:
+      - name: Require stable branch for publishing
+        if: github.event_name == 'workflow_dispatch' && inputs.publish_release
+        run: |
+          if [ "$GITHUB_REF_NAME" != stable ]; then
+            echo "::error::releases must be dispatched from the stable branch"
+            exit 1
+          fi
+
      - uses: actions/checkout@v7
      - uses: actions/setup-python@v7
        with: { python-version: '3.12' }
@@ -939,6 +950,13 @@ jobs:
      - package-checksums
    if: github.event_name == 'workflow_dispatch' && inputs.publish_release
    steps:
+      - name: Require stable branch
+        run: |
+          if [ "$GITHUB_REF_NAME" != stable ]; then
+            echo "::error::releases must be dispatched from the stable branch"
+            exit 1
+          fi
+
      - uses: actions/download-artifact@v8
        with:
          name: rz-frida-release-assets
@@ -985,6 +1003,6 @@ jobs:
          target_commitish: ${{ steps.meta.outputs.target_commitish }}
          generate_release_notes: true
          draft: false
-          prerelease: ${{ inputs.prerelease == 'true' }}
+          prerelease: ${{ inputs.prerelease }}
          fail_on_unmatched_files: true
          files: release-assets/*
@@ -1,9 +1,9 @@
 name: Open dependency pin pull request

-# Publisher for the diff produced by the read-only "Update dependency pins"
-# collector. It only downloads that run's validated patch, applies it, and
-# pushes a branch / opens the pr. All patch validation stuff happens
-# in the collector.
+# Publisher for the diffs produced by the read-only "Update dependency pins"
+# collector. It only downloads that run's validated patches, applies them, and
+# pushes branches / opens the PRs. All patch validation stuff happens in the
+# collector.

 on:
  workflow_run:
@@ -14,26 +14,32 @@ permissions:
  actions: read
  contents: read

-concurrency:
-  group: update-deps-pr
-  cancel-in-progress: false
-
 jobs:
  open:
-    name: Open pull request
+    name: Open pull request (${{ matrix.target }})
    if: >-
      github.event.workflow_run.conclusion == 'success' &&
      github.event.workflow_run.event != 'pull_request' &&
      (github.event.workflow_run.event == 'schedule' ||
       github.event.workflow_run.event == 'workflow_dispatch') &&
-      github.event.workflow_run.head_branch == 'main' &&
+      github.event.workflow_run.head_branch == 'dev' &&
      github.event.workflow_run.head_repository.full_name == github.repository
    runs-on: ubuntu-latest
+    concurrency:
+      group: update-deps-pr-${{ matrix.target }}
+      cancel-in-progress: false
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [dev, stable]
+    env:
+      BASE_BRANCH: ${{ matrix.target }}
+      ARTIFACT: pins-patch-${{ matrix.target }}
    steps:
      - uses: actions/checkout@v7
        with:
          persist-credentials: false
-          ref: ${{ github.event.workflow_run.head_sha }}
+          ref: ${{ matrix.target }}

      - name: Download pin diff
        id: download
@@ -42,24 +48,32 @@ jobs:
          RUN_ID: ${{ github.event.workflow_run.id }}
        run: |
          set -euo pipefail
+          case "$BASE_BRANCH" in
+            dev|stable) ;;
+            *)
+              echo "::error::unexpected target branch: $BASE_BRANCH"
+              exit 1
+              ;;
+          esac
          count=$(gh api --paginate \
            "repos/${GITHUB_REPOSITORY}/actions/runs/${RUN_ID}/artifacts" \
-            --jq '.artifacts[] | select(.name == "pins-patch" and .expired == false) | .id' \
+            --jq ".artifacts[] | select(.name == \"${ARTIFACT}\" and .expired == false) | .id" \
            | wc -l)
          case "$count" in
            0)
-              echo "no pin diff to publish"
+              echo "no pin diff to publish for ${BASE_BRANCH}"
              exit 0
              ;;
            1) ;;
            *)
-              echo "::error::expected one non-expired pins-patch artifact, found ${count}"
+              echo "::error::expected one non-expired ${ARTIFACT} artifact, found ${count}"
              exit 1
              ;;
          esac
          dest="${RUNNER_TEMP}/pins-patch"
          rm -rf "$dest"
-          gh run download "$RUN_ID" --repo "$GITHUB_REPOSITORY" --name pins-patch --dir "$dest"
+          gh run download "$RUN_ID" --repo "$GITHUB_REPOSITORY" \
+            --name "$ARTIFACT" --dir "$dest"
          mapfile -d '' patches < <(find "$dest" -type f -name pins.patch -print0)
          if [ "${#patches[@]}" -ne 1 ]; then
            echo "::error::expected exactly one pins.patch in the artifact, found ${#patches[@]}"
@@ -96,7 +110,7 @@ jobs:
          fi
          git -c user.name='github-actions[bot]' \
              -c user.email='41898282+github-actions[bot]@users.noreply.github.com' \
-              commit -m 'update release dependency pins'
+              commit -m "update ${BASE_BRANCH} dependency pins"

      - name: Push branch and open pull request
        if: steps.download.outputs.found == 'true'
@@ -108,8 +122,31 @@ jobs:
            echo "::error::DEPENDENCY_PIN_PR_TOKEN is not set; cannot publish the pin pr"
            exit 1
          fi
+          case "$BASE_BRANCH" in
+            stable)
+              branch=deps/update-release-pins
+              title='update release dependency pins'
+              body=$(printf '%s\n' \
+                '## Summary' \
+                '- bump the rizin / frida / Cutter version pins in the workflows to their latest releases' \
+                '' \
+                'Release prep input: merge once stable code is compatible with the bump.')
+              ;;
+            dev)
+              branch=deps/update-dev-pins
+              title='update dev dependency pins'
+              body=$(printf '%s\n' \
+                '## Summary' \
+                '- bump the dependency pins in the workflows to their latest releases' \
+                '' \
+                'dev CI builds rizin from its dev branch, so rizin pin bumps affect release prep only.')
+              ;;
+            *)
+              echo "::error::unexpected target branch: $BASE_BRANCH"
+              exit 1
+              ;;
+          esac
          gh auth setup-git
-          branch=deps/update-release-pins
          if git ls-remote --exit-code origin "refs/heads/${branch}" >/dev/null 2>&1; then
            git fetch origin "refs/heads/${branch}:refs/remotes/origin/${branch}"
            git push --force-with-lease="refs/heads/${branch}:refs/remotes/origin/${branch}" \
@@ -117,11 +154,18 @@ jobs:
          else
            git push origin "HEAD:refs/heads/${branch}"
          fi
-          title='update release dependency pins'
-          body=$(printf '%s\n' '## Summary' '- bump the rizin / frida / Cutter version pins in the workflows to their latest releases')
          state=$(gh pr view "$branch" --repo "$GITHUB_REPOSITORY" --json state --jq .state 2>/dev/null || true)
-          if [ "$state" = "OPEN" ]; then
-            gh pr edit "$branch" --repo "$GITHUB_REPOSITORY" --title "$title" --body "$body"
-          else
-            gh pr create --repo "$GITHUB_REPOSITORY" --base main --head "$branch" --title "$title" --body "$body"
-          fi
+          case "$state" in
+            OPEN)
+              gh pr edit "$branch" --repo "$GITHUB_REPOSITORY" \
+                --base "$BASE_BRANCH" --title "$title" --body "$body"
+              ;;
+            CLOSED)
+              gh pr reopen "$branch" --repo "$GITHUB_REPOSITORY"
+              gh pr edit "$branch" --repo "$GITHUB_REPOSITORY" \
+                --base "$BASE_BRANCH" --title "$title" --body "$body"
+              ;;
+            *)
+              gh pr create --repo "$GITHUB_REPOSITORY" --base "$BASE_BRANCH" --head "$branch" --title "$title" --body "$body"
+              ;;
+          esac
@@ -18,11 +18,16 @@ concurrency:

 jobs:
  collect:
-    name: Check for newer dependency releases
+    name: Check for newer dependency releases (${{ matrix.target }})
    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [dev, stable]
    steps:
      - uses: actions/checkout@v7
        with:
+          ref: ${{ matrix.target }}
          persist-credentials: false

      - name: Bump version pins
@@ -55,7 +60,7 @@ jobs:
      - uses: actions/upload-artifact@v7
        if: steps.diff.outputs.changed == 'true'
        with:
-          name: pins-patch
+          name: pins-patch-${{ matrix.target }}
          path: pins.patch
          retention-days: 5
          if-no-files-found: error
@@ -4,6 +4,16 @@ Frida integration plugin for Rizin and Cutter.

 The Rizin plugin provides the backend and command interface. The Cutter plugin provides a native frontend over the Rizin backend.

+## Branches
+
+- `dev` (default): development branch. CI builds against rizin `dev`.
+- `stable`: release branch. Uses the rizin, frida, and Cutter releases
+  pinned in the workflows. Fixes that apply to the released APIs are
+  cherry-picked here, and releases are tagged here.
+
+Pull requests target `dev` by default. Dependency pin PRs are opened
+against both branches when a newer release is available.
+
 ## Screenshots

 ![Rizin CLI command help](.images/rizin-cli.png)
@@ -2,12 +2,13 @@

 The plugin is a rizin core plugin: it registers the `Fr` command group
 inside rizin. It needs rizin v0.9.0 or later (the per-core plugin context
-from [rizin#6404](https://github.com/rizinorg/rizin/pull/6404)). CI builds
-against v0.9.1. It also needs rizin's development files. With
-`-Dfrida_core=enabled` and no manual paths, meson fetches the frida-core
-devkit for the host (see `frida_version` in `meson_options.txt`). Without
-frida-core the plugin still builds, and device commands answer with a
-`frida_unavailable` error.
+from [rizin#6404](https://github.com/rizinorg/rizin/pull/6404)). The
+`stable` branch builds against the rizin release pinned in the workflows
+and the `dev` branch builds against rizin `dev`. It also needs rizin's
+development files. With `-Dfrida_core=enabled` and no manual paths,
+meson fetches the frida-core devkit for the host (see `frida_version`
+in `meson_options.txt`). Without frida-core the plugin still builds,
+and device commands answer with a `frida_unavailable` error.

 The examples below use a prefix of `$PREFIX`. Replace it with wherever you
 install rizin (`/usr/local`, `$HOME/.local`, and so on). `rizin -H` prints
@@ -49,12 +49,12 @@ static RzCmdStatus print_status(RzCore *core, RzCmdStateOutput *state) {

 	switch (state->mode) {
 	case RZ_OUTPUT_MODE_STANDARD:
-		rz_cons_printf("active: %s\n", rz_str_bool(active));
-		rz_cons_printf("state: %s\n", state_string);
+		rz_cons_printf(core->cons,"active: %s\n", rz_str_bool(active));
+		rz_cons_printf(core->cons,"state: %s\n", state_string);
 		if (session) {
-			rz_cons_printf("pid: %u\n", rz_frida_session_target_pid(session));
-			rz_cons_printf("action: %s\n", uri->action);
-			rz_cons_printf("target: %s\n", uri->target);
+			rz_cons_printf(core->cons,"pid: %u\n", rz_frida_session_target_pid(session));
+			rz_cons_printf(core->cons,"action: %s\n", uri->action);
+			rz_cons_printf(core->cons,"target: %s\n", uri->target);
 		}
 		return RZ_CMD_STATUS_OK;
 	case RZ_OUTPUT_MODE_JSON:
@@ -74,7 +74,7 @@ static RzCmdStatus print_status(RzCore *core, RzCmdStateOutput *state) {
 	}
 }

-static RzCmdStatus print_uri(const char *uri_string, RzCmdStateOutput *state) {
+static RzCmdStatus print_uri(const char *uri_string, RzCmdStateOutput *state, RzCons* cons) {
 	rz_return_val_if_fail(state, RZ_CMD_STATUS_ERROR);

 	RzFridaUri uri = { 0 };
@@ -102,10 +102,10 @@ static RzCmdStatus print_uri(const char *uri_string, RzCmdStateOutput *state) {

 	switch (state->mode) {
 	case RZ_OUTPUT_MODE_STANDARD:
-		rz_cons_printf("action: %s\n", uri.action);
-		rz_cons_printf("transport: %s\n", uri.transport);
-		rz_cons_printf("device: %s\n", uri.device);
-		rz_cons_printf("target: %s\n", uri.target);
+		rz_cons_printf(cons,"action: %s\n", uri.action);
+		rz_cons_printf(cons,"transport: %s\n", uri.transport);
+		rz_cons_printf(cons,"device: %s\n", uri.device);
+		rz_cons_printf(cons,"target: %s\n", uri.target);
 		break;
 	case RZ_OUTPUT_MODE_JSON:
 		rz_frida_json_ok_begin(state->d.pj);
@@ -132,7 +132,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridas_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int

 RZ_IPI RzCmdStatus rz_cmd_fridau_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int argc, RZ_NONNULL const char **argv, RZ_NONNULL RzCmdStateOutput *state) {
 	rz_return_val_if_fail(core && argv && state, RZ_CMD_STATUS_ERROR);
-	return print_uri(argv[1], state);
+	return print_uri(argv[1], state, core->cons);
 }

 RZ_IPI RzCmdStatus rz_cmd_fridad_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int argc, RZ_NONNULL const char **argv, RZ_NONNULL RzCmdStateOutput *state) {
@@ -246,9 +246,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridao_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 	// backend_open writes the envelope either way. only keep the session if it opened.
 	// the cons break hook forwards a Cutter breakTask (or Ctrl-C) into the session's
 	// cancellable, which frida's blocking attach/connect uses.
-	rz_cons_break_push(frida_cancel_on_break, session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, session);
 	bool opened = rz_frida_backend_open(session, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	if (!opened) {
 		rz_frida_session_free(session);
 		return RZ_CMD_STATUS_OK;
@@ -314,9 +314,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridae_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}

-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_eval(ctx->session, argv[1], pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -338,9 +338,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridal_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET, "cannot read the script file");
 		return RZ_CMD_STATUS_OK;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_eval(ctx->session, source, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	free(source);
 	return RZ_CMD_STATUS_OK;
 }
@@ -358,9 +358,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridai_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}

-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_ping(ctx->session, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -401,9 +401,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridax_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 	}

 	ut64 address = rz_num_math(core->num, argv[1]);
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_mem_read(ctx->session, address, size, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -478,9 +478,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaw_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}
 	ut64 address = rz_num_math(core->num, argv[1]);
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_mem_write(ctx->session, address, bytes, (size_t)len, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	free(bytes);
 	return RZ_CMD_STATUS_OK;
 }
@@ -500,9 +500,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaR_handler(RZ_NONNULL RzCore *core, int argc, RZ_N

 	// any arg forces a fresh enumeration instead of cached ranges.
 	bool refresh = (argc > 1) && RZ_STR_ISNOTEMPTY(argv[1]);
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_ranges(ctx->session, refresh, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -519,9 +519,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridat_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}

-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_threads(ctx->session, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -540,9 +540,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaM_handler(RZ_NONNULL RzCore *core, int argc, RZ_N

 	// any arg forces fresh enum instead of cached modules.
 	bool refresh = (argc > 1) && RZ_STR_ISNOTEMPTY(argv[1]);
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_modules(ctx->session, refresh, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -559,9 +559,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaE_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}

-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_exports(ctx->session, argv[1], pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -578,9 +578,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaI_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}

-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_imports(ctx->session, argv[1], pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -597,9 +597,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaS_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		return RZ_CMD_STATUS_OK;
 	}

-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_symbols(ctx->session, argv[1], pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -617,14 +617,14 @@ RZ_IPI RzCmdStatus rz_cmd_fridab_handler(RZ_NONNULL RzCore *core, int argc, RZ_N
 	}

 	// an addr sets a breakpoint, no arg lists the current breakpoints.
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	if (argc > 1 && RZ_STR_ISNOTEMPTY(argv[1])) {
 		ut64 address = rz_num_math(core->num, argv[1]);
 		rz_frida_backend_bp_set(ctx->session, address, pj);
 	} else {
 		rz_frida_backend_bp_list(ctx->session, pj);
 	}
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -648,9 +648,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridab_minus_handler(RZ_NONNULL RzCore *core, RZ_UNUSE
 		rz_strf(address_str, "0x%" PFMT64x, address);
 		target = address_str;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_bp_remove(ctx->session, target, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -674,9 +674,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridag_handler(RZ_NONNULL RzCore *core, int argc, RZ_N
 		rz_strf(tid, "%" PFMT64u, rz_num_math(core->num, argv[1]));
 		thread_id = tid;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_continue(ctx->session, thread_id, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -694,7 +694,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaB_handler(RZ_NONNULL RzCore *core, int argc, RZ_N
 	}

 	ut64 thread_id = rz_num_math(core->num, argv[1]);
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	if (argc > 3) {
 		char value_str[32];
 		rz_strf(value_str, "0x%" PFMT64x, rz_num_math(core->num, argv[3]));
@@ -704,7 +704,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaB_handler(RZ_NONNULL RzCore *core, int argc, RZ_N
 	} else {
 		rz_frida_backend_reg_read(ctx->session, thread_id, pj);
 	}
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -722,7 +722,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaW_handler(RZ_NONNULL RzCore *core, int argc, RZ_N
 	}

 	// addr sets watchpoint, no arg lists current wps.
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	if (argc > 1 && RZ_STR_ISNOTEMPTY(argv[1])) {
 		ut64 address = rz_num_math(core->num, argv[1]);
 		ut64 size = (argc > 2) ? rz_num_math(core->num, argv[2]) : 0;
@@ -732,7 +732,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaW_handler(RZ_NONNULL RzCore *core, int argc, RZ_N
 	} else {
 		rz_frida_backend_wp_list(ctx->session, pj);
 	}
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -756,9 +756,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaW_minus_handler(RZ_NONNULL RzCore *core, RZ_UNUSE
 		rz_strf(address_str, "0x%" PFMT64x, address);
 		target = address_str;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_wp_remove(ctx->session, target, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -773,9 +773,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaJ_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET, "no session is open");
 		return RZ_CMD_STATUS_OK;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_java_available(ctx->session, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -790,9 +790,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaL_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET, "no session is open");
 		return RZ_CMD_STATUS_OK;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_loaders(ctx->session, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -810,9 +810,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaC_handler(RZ_NONNULL RzCore *core, int argc,
 	}
 	const char *prefix = (argc > 1 && RZ_STR_ISNOTEMPTY(argv[1])) ? argv[1] : NULL;
 	ut64 max = rz_config_get_integer(core->config, "frida.java.max");
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_classes(ctx->session, prefix, max, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -829,7 +829,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaN_handler(RZ_NONNULL RzCore *core, int argc,
 		return RZ_CMD_STATUS_OK;
 	}
 	bool enable = true;
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	if (argc > 1 && RZ_STR_ISNOTEMPTY(argv[1])) {
 		if (RZ_STR_EQ(argv[1], "start")) {
 			enable = true;
@@ -838,14 +838,14 @@ RZ_IPI RzCmdStatus rz_cmd_fridaN_handler(RZ_NONNULL RzCore *core, int argc,
 		} else {
 			rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET,
 				"FrNj expects start, stop, or no arguments to list");
-			rz_cons_break_pop();
+			rz_interrupt_break_pop(core->intr);
 			return RZ_CMD_STATUS_OK;
 		}
 		rz_frida_backend_class_load_monitor(ctx->session, enable, pj);
 	} else {
 		rz_frida_backend_newly_loaded_classes(ctx->session, pj);
 	}
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -861,7 +861,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaRN_handler(RZ_NONNULL RzCore *core, int argc,
 		rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET, "no session is open");
 		return RZ_CMD_STATUS_OK;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	if (argc > 1 && RZ_STR_ISNOTEMPTY(argv[1])) {
 		if (RZ_STR_EQ(argv[1], "on")) {
 			rz_frida_backend_rn_set(ctx->session, true, pj);
@@ -872,13 +872,13 @@ RZ_IPI RzCmdStatus rz_cmd_fridaRN_handler(RZ_NONNULL RzCore *core, int argc,
 		} else {
 			rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET,
 				"FrRNj expects on, off, import, or no arguments to list");
-			rz_cons_break_pop();
+			rz_interrupt_break_pop(core->intr);
 			return RZ_CMD_STATUS_OK;
 		}
 	} else {
 		rz_frida_backend_rn_list(ctx->session, pj);
 	}
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -894,9 +894,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaf_handler(RZ_NONNULL RzCore *core, RZ_UNUSED int
 		rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET, "no session is open");
 		return RZ_CMD_STATUS_OK;
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_flag_import(ctx->session, core, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -913,9 +913,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaX_handler(RZ_NONNULL RzCore *core, int argc,
 		return RZ_CMD_STATUS_OK;
 	}
 	const char *prefix = (argc > 1 && RZ_STR_ISNOTEMPTY(argv[1])) ? argv[1] : NULL;
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_dex_diff(ctx->session, core, prefix, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -940,9 +940,9 @@ RZ_IPI RzCmdStatus rz_cmd_fridaD_handler(RZ_NONNULL RzCore *core, int argc,
 	if (argc > 2 && RZ_STR_ISNOTEMPTY(argv[2])) {
 		loaderId = rz_num_math(core->num, argv[2]);
 	}
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	rz_frida_backend_class_describe(ctx->session, className, loaderId, pj);
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }

@@ -969,7 +969,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaIm_handler(RZ_NONNULL RzCore *core, int argc,
 	}

 	bool has_dot = (strchr(className, '.') != NULL);
-	rz_cons_break_push(frida_cancel_on_break, ctx->session);
+	rz_interrupt_break_push(core->intr, frida_cancel_on_break, ctx->session);
 	if (has_dot) {
 		rz_frida_backend_import_class(ctx->session, core, className, loaderId, pj);
 	} else {
@@ -983,7 +983,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaIm_handler(RZ_NONNULL RzCore *core, int argc,
 			}
 			rz_frida_json_error(pj, RZ_FRIDA_ERROR_INVALID_TARGET,
 				"no matching classes found for the given prefix");
-			rz_cons_break_pop();
+			rz_interrupt_break_pop(core->intr);
 			return RZ_CMD_STATUS_OK;
 		}

@@ -1026,7 +1026,7 @@ RZ_IPI RzCmdStatus rz_cmd_fridaIm_handler(RZ_NONNULL RzCore *core, int argc,
 		pj_kn(pj, "constructors", (ut64)total_c);
 		rz_frida_json_ok_end(pj);
 	}
-	rz_cons_break_pop();
+	rz_interrupt_break_pop(core->intr);
 	return RZ_CMD_STATUS_OK;
 }
Author	SHA1	Message	Date
Premade	fbfd751a23	Pass cons arg to fcns (#21 )	2026-10-27 23:01:54 +08:00
Alok Kumar Mishra	330bb3f625	fix prerelease input handling (#25 )	2026-10-26 11:09:08 +00:00
Alok Kumar Mishra	30b9e6dac7	Split dev and stable branch workflows (#22 )	2026-10-25 22:22:25 +00:00